mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-11 15:37:29 +02:00
Reorder preferences panel
"Use login shell" is now enabled by default and has been moved to the Advanced pane. Also, when clicking this or the "Use ATSUI renderer" button the preload cache is rebuilt.
This commit is contained in:
@@ -74,6 +74,8 @@
|
||||
<dict>
|
||||
<key>ACTIONS</key>
|
||||
<dict>
|
||||
<key>atsuiButtonClicked</key>
|
||||
<string>id</string>
|
||||
<key>loginShellButtonClicked</key>
|
||||
<string>id</string>
|
||||
<key>quickstartButtonClicked</key>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
<integer>5</integer>
|
||||
<key>IBOpenObjects</key>
|
||||
<array>
|
||||
<integer>620</integer>
|
||||
<integer>115</integer>
|
||||
</array>
|
||||
<key>IBSystem Version</key>
|
||||
<string>9E17</string>
|
||||
|
||||
Binary file not shown.
@@ -117,6 +117,7 @@ static int executeInLoginShell(NSString *path, NSArray *args);
|
||||
- (int)maxPreloadCacheSize;
|
||||
- (MMVimController *)takeVimControllerFromCache;
|
||||
- (void)clearPreloadCacheWithCount:(int)count;
|
||||
- (void)rebuildPreloadCache;
|
||||
- (NSDate *)rcFilesModificationDate;
|
||||
- (BOOL)openVimControllerWithArguments:(NSDictionary *)arguments;
|
||||
- (void)activateWhenNextWindowOpens;
|
||||
@@ -165,7 +166,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
|
||||
[NSNumber numberWithBool:YES], MMTranslateCtrlClickKey,
|
||||
[NSNumber numberWithInt:0], MMOpenInCurrentWindowKey,
|
||||
[NSNumber numberWithBool:NO], MMNoFontSubstitutionKey,
|
||||
[NSNumber numberWithBool:NO], MMLoginShellKey,
|
||||
[NSNumber numberWithBool:YES], MMLoginShellKey,
|
||||
[NSNumber numberWithBool:NO], MMAtsuiRendererKey,
|
||||
[NSNumber numberWithInt:MMUntitledWindowAlways],
|
||||
MMUntitledWindowKey,
|
||||
@@ -964,15 +965,18 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
|
||||
[NSApp makeWindowsPerform:@selector(performZoom:) inOrder:YES];
|
||||
}
|
||||
|
||||
- (IBAction)atsuiButtonClicked:(id)sender
|
||||
{
|
||||
// This action is called when the user clicks the "use ATSUI renderer"
|
||||
// button in the advanced preferences pane.
|
||||
[self rebuildPreloadCache];
|
||||
}
|
||||
|
||||
- (IBAction)loginShellButtonClicked:(id)sender
|
||||
{
|
||||
// This action is called when the user clicks the "use login shell" button
|
||||
// in the general preferences pane.
|
||||
if ([self maxPreloadCacheSize] > 0) {
|
||||
[self clearPreloadCacheWithCount:-1];
|
||||
[self cancelVimControllerPreloadRequests];
|
||||
[self scheduleVimControllerPreloadAfterDelay:1.0];
|
||||
}
|
||||
// in the advanced preferences pane.
|
||||
[self rebuildPreloadCache];
|
||||
}
|
||||
|
||||
- (IBAction)quickstartButtonClicked:(id)sender
|
||||
@@ -1559,6 +1563,15 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
|
||||
[cachedVimControllers removeObjectAtIndex:0];
|
||||
}
|
||||
|
||||
- (void)rebuildPreloadCache
|
||||
{
|
||||
if ([self maxPreloadCacheSize] > 0) {
|
||||
[self clearPreloadCacheWithCount:-1];
|
||||
[self cancelVimControllerPreloadRequests];
|
||||
[self scheduleVimControllerPreloadAfterDelay:1.0];
|
||||
}
|
||||
}
|
||||
|
||||
- (NSDate *)rcFilesModificationDate
|
||||
{
|
||||
// Check modification dates for ~/.vimrc and ~/.gvimrc and return the
|
||||
|
||||
Reference in New Issue
Block a user