Skip to content

Commit 160949d

Browse files
committed
Expose setting to only open untitled window only on reactivation
This setting makes it so that on first launch MacVim wouldn't open an untitled window but would only do so on reactivation (i.e. clicking on the Dock icon). It already worked before but just needed to be exposed. Close #1483
1 parent 5ca4161 commit 160949d

File tree

1 file changed

+29
-25
lines changed

1 file changed

+29
-25
lines changed

src/MacVim/Base.lproj/Preferences.xib

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
2525
<userDefaultsController representsSharedInstance="YES" id="58" userLabel="Shared Defaults"/>
2626
<customView id="115" userLabel="General">
27-
<rect key="frame" x="0.0" y="0.0" width="483" height="362"/>
27+
<rect key="frame" x="0.0" y="0.0" width="483" height="382"/>
2828
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2929
<subviews>
3030
<customView id="5x5-P0-afk" userLabel="Open untitled window">
31-
<rect key="frame" x="20" y="284" width="433" height="58"/>
31+
<rect key="frame" x="20" y="284" width="433" height="78"/>
3232
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
3333
<subviews>
34-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="117">
35-
<rect key="frame" x="-2" y="41" width="187" height="17"/>
34+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="117">
35+
<rect key="frame" x="-2" y="61" width="187" height="17"/>
3636
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
3737
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Open untitled window:" id="973">
3838
<font key="font" metaFont="system"/>
@@ -41,7 +41,7 @@
4141
</textFieldCell>
4242
</textField>
4343
<matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" id="119">
44-
<rect key="frame" x="190" y="0.0" width="243" height="58"/>
44+
<rect key="frame" x="190" y="0.0" width="243" height="78"/>
4545
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
4646
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
4747
<size key="cellSize" width="243" height="18"/>
@@ -52,14 +52,18 @@
5252
</buttonCell>
5353
<cells>
5454
<column>
55-
<buttonCell type="radio" title="on launch and re-activation" imagePosition="left" alignment="left" state="on" tag="3" inset="2" id="139">
55+
<buttonCell type="radio" title="on launch and re-activation" imagePosition="left" alignment="left" tag="3" inset="2" id="139">
5656
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
5757
<font key="font" metaFont="system"/>
5858
</buttonCell>
5959
<buttonCell type="radio" title="only when MacVim launches" imagePosition="left" alignment="left" tag="1" inset="2" id="138">
6060
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
6161
<font key="font" metaFont="system"/>
6262
</buttonCell>
63+
<buttonCell type="radio" title="only on re-activation" imagePosition="left" alignment="left" tag="2" inset="2" id="140">
64+
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
65+
<font key="font" metaFont="system"/>
66+
</buttonCell>
6367
<buttonCell type="radio" title="never" imagePosition="left" alignment="left" inset="2" id="137">
6468
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
6569
<font key="font" metaFont="system"/>
@@ -76,7 +80,7 @@
7680
<rect key="frame" x="20" y="144" width="433" height="132"/>
7781
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
7882
<subviews>
79-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="116">
83+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="116">
8084
<rect key="frame" x="-2" y="115" width="187" height="17"/>
8185
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
8286
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Open files from applications:" id="972">
@@ -117,7 +121,7 @@
117121
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
118122
<popUpButtonCell key="cell" type="push" title="and set the arglist" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="436" id="978">
119123
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
120-
<font key="font" metaFont="menu"/>
124+
<font key="font" metaFont="message"/>
121125
<menu key="menu" title="OtherViews" id="429">
122126
<items>
123127
<menuItem title="with a tab for each file" tag="3" id="430"/>
@@ -139,7 +143,7 @@
139143
<binding destination="58" name="selectedTag" keyPath="values.MMOpenLayout" id="441"/>
140144
</connections>
141145
</popUpButton>
142-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="121">
146+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="121">
143147
<rect key="frame" x="190" y="0.0" width="243" height="58"/>
144148
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
145149
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" id="974">
@@ -155,7 +159,7 @@
155159
<rect key="frame" x="20" y="114" width="381" height="22"/>
156160
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
157161
<subviews>
158-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="126">
162+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="126">
159163
<rect key="frame" x="-2" y="3" width="187" height="17"/>
160164
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
161165
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="After last window closes:" id="977">
@@ -169,7 +173,7 @@
169173
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
170174
<popUpButtonCell key="cell" type="push" title="Keep MacVim Running" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="960" id="979">
171175
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
172-
<font key="font" metaFont="menu"/>
176+
<font key="font" metaFont="message"/>
173177
<menu key="menu" title="OtherViews" id="959">
174178
<items>
175179
<menuItem title="Keep MacVim Running" state="on" id="960"/>
@@ -201,7 +205,7 @@
201205
<binding destination="58" name="value" keyPath="values.MMSmoothResize" id="Wkt-gU-ZnK"/>
202206
</connections>
203207
</button>
204-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Lmi-H0-cPd" userLabel="Window resizing">
208+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Lmi-H0-cPd" userLabel="Window resizing">
205209
<rect key="frame" x="-2" y="0.0" width="187" height="17"/>
206210
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
207211
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Resizing window:" id="ExQ-6y-pyN" userLabel="Window resizing:">
@@ -227,7 +231,7 @@
227231
<binding destination="58" name="value" keyPath="values.MMShowWhatsNewOnStartup" id="LjF-Lv-00h"/>
228232
</connections>
229233
</button>
230-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qpS-3j-8OG">
234+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qpS-3j-8OG">
231235
<rect key="frame" x="-2" y="0.0" width="187" height="17"/>
232236
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
233237
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="S5x-il-vbq">
@@ -273,7 +277,7 @@
273277
</subviews>
274278
</customView>
275279
</subviews>
276-
<point key="canvasLocation" x="137.5" y="-27"/>
280+
<point key="canvasLocation" x="137.5" y="-17"/>
277281
</customView>
278282
<customView id="hr4-G4-3ZG" userLabel="Appearance">
279283
<rect key="frame" x="0.0" y="0.0" width="483" height="360"/>
@@ -283,7 +287,7 @@
283287
<rect key="frame" x="19" y="182" width="433" height="156"/>
284288
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
285289
<subviews>
286-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="T40-Os-PUf" userLabel="Dark mode selection">
290+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="T40-Os-PUf" userLabel="Dark mode selection">
287291
<rect key="frame" x="-2" y="139" width="187" height="17"/>
288292
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
289293
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Dark mode selection:" id="rgk-9z-Mrz">
@@ -328,7 +332,7 @@
328332
<outlet property="delegate" destination="58" id="Sob-YR-Fmp"/>
329333
</connections>
330334
</matrix>
331-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="1Lk-MW-O2L">
335+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="1Lk-MW-O2L">
332336
<rect key="frame" x="188" y="0.0" width="243" height="70"/>
333337
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
334338
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" id="tgh-S7-3or">
@@ -344,7 +348,7 @@
344348
<rect key="frame" x="19" y="118" width="433" height="56"/>
345349
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
346350
<subviews>
347-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="9Rk-gT-kVC" userLabel="Titlebar appearance">
351+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="9Rk-gT-kVC" userLabel="Titlebar appearance">
348352
<rect key="frame" x="-2" y="38" width="187" height="17"/>
349353
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
350354
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Window appearance:" id="HEH-Lo-v4I" userLabel="Titlebar appearance:">
@@ -406,7 +410,7 @@
406410
<binding destination="58" name="value" keyPath="values.MMNativeFullScreen" id="Y8t-au-n4b"/>
407411
</connections>
408412
</button>
409-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="VAj-Yx-2uZ">
413+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="VAj-Yx-2uZ">
410414
<rect key="frame" x="-2" y="20" width="187" height="17"/>
411415
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
412416
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Full Screen:" id="bMQ-uG-iDR">
@@ -452,7 +456,7 @@
452456
<binding destination="58" name="value" keyPath="values.MMFontPreserveLineSpacing" id="6cJ-Uj-qVy"/>
453457
</connections>
454458
</button>
455-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="8WW-zu-LlE" userLabel="Font">
459+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="8WW-zu-LlE" userLabel="Font">
456460
<rect key="frame" x="-2" y="0.0" width="187" height="17"/>
457461
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
458462
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Font:" id="eV4-3c-P2e">
@@ -480,7 +484,7 @@
480484
<binding destination="58" name="value" keyPath="values.MMCmdLineAlignBottom" id="pIr-52-5vV"/>
481485
</connections>
482486
</button>
483-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Lzq-i0-zWi" userLabel="Cmdline">
487+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Lzq-i0-zWi" userLabel="Cmdline">
484488
<rect key="frame" x="-2" y="0.0" width="187" height="17"/>
485489
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
486490
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Command-line:" id="2Lp-vX-AcA">
@@ -502,7 +506,7 @@
502506
<rect key="frame" x="20" y="72" width="433" height="18"/>
503507
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
504508
<subviews>
505-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="f18-Wr-EgZ">
509+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="f18-Wr-EgZ">
506510
<rect key="frame" x="-2" y="0.0" width="187" height="17"/>
507511
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
508512
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Trackpad:" id="jkp-Ls-ZhN">
@@ -596,7 +600,7 @@
596600
<binding destination="58" name="value" keyPath="values.MMUpdaterPrereleaseChannel" id="Kb1-yL-bmN"/>
597601
</connections>
598602
</button>
599-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="826">
603+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="826">
600604
<rect key="frame" x="18" y="218" width="449" height="56"/>
601605
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
602606
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="993">
@@ -618,7 +622,7 @@
618622
<binding destination="58" name="value" keyPath="values.MMPreloadCacheSize" id="828"/>
619623
</connections>
620624
</button>
621-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="815">
625+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="815">
622626
<rect key="frame" x="18" y="300" width="449" height="28"/>
623627
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
624628
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="(Deprecated) Deselect this option to use the legacy renderer, which is unsupported and will be removed in a future version." id="991">
@@ -639,7 +643,7 @@
639643
<binding destination="58" name="value" keyPath="values.MMRenderer" id="1000"/>
640644
</connections>
641645
</button>
642-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="1001">
646+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="1001">
643647
<rect key="frame" x="18" y="122" width="444" height="70"/>
644648
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
645649
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="1004">
@@ -660,7 +664,7 @@
660664
<binding destination="58" name="value" keyPath="values.MMUseInlineIm" id="1016"/>
661665
</connections>
662666
</button>
663-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ere-oJ-WLd">
667+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ere-oJ-WLd">
664668
<rect key="frame" x="19" y="20" width="449" height="70"/>
665669
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
666670
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="Gdp-Ib-RGS">

0 commit comments

Comments
 (0)