Skip to content

Commit 1e3514c

Browse files
author
Yousef El-Zebdeh
committed
Renamamed methods and inteface labels
Stay On Bottom > Stay in Back Stay On Top > Stay in Front These fit closer to Apple's terminology as seen with iOS simulator.
1 parent 263115a commit 1e3514c

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

runtime/menu.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ if has("gui_macvim")
8080
an <silent> 9998.350 Window.Select\ Previous\ Tab :tabprevious<CR>
8181
an 9998.360 Window.-SEP2- <Nop>
8282
an <silent> 9998.370 Window.Bring\ All\ To\ Front <Nop>
83-
an <silent> 9998.380 Window.Stay\ On\ Bottom <Nop>
84-
an <silent> 9998.390 Window.Stay\ On\ Top <Nop>
83+
an <silent> 9998.380 Window.Stay\ in\ Front <Nop>
84+
an <silent> 9998.390 Window.Stay\ in\ Back <Nop>
8585
an <silent> 9998.400 Window.Stay\ Level\ Normal <Nop>
8686
endif
8787

@@ -1258,8 +1258,8 @@ if has("gui_macvim")
12581258
macm Window.Select\ Next\ Tab key=<D-}>
12591259
macm Window.Select\ Previous\ Tab key=<D-{>
12601260
macm Window.Bring\ All\ To\ Front action=arrangeInFront:
1261-
macm Window.Stay\ On\ Bottom action=stayOnBottom:
1262-
macm Window.Stay\ On\ Top action=stayOnTop:
1261+
macm Window.Stay\ in\ Front action=stayInFront:
1262+
macm Window.Stay\ in\ Back action=stayInBack:
12631263
macm Window.Stay\ Level\ Normal action=stayLevelNormal:
12641264

12651265
macm Help.MacVim\ Help key=<D-?>

src/MacVim/Actions.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
<string></string>
7373
<key>zoomAll:</key>
7474
<string></string>
75-
<key>stayOnBottom:</key>
75+
<key>stayInFront:</key>
7676
<string></string>
77-
<key>stayOnTop:</key>
77+
<key>stayInBack:</key>
7878
<string></string>
7979
<key>stayLevelNormal:</key>
8080
<string></string>

src/MacVim/MMAppController.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
- (IBAction)openWebsite:(id)sender;
5454
- (IBAction)showVimHelp:(id)sender;
5555
- (IBAction)zoomAll:(id)sender;
56-
- (IBAction)stayOnBottom:(id)sender;
57-
- (IBAction)stayOnTop:(id)sender;
56+
- (IBAction)stayInFront:(id)sender;
57+
- (IBAction)stayInBack:(id)sender;
5858
- (IBAction)stayLevelNormal:(id)sender;
5959

6060
@end

src/MacVim/MMAppController.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,18 +1196,18 @@ - (IBAction)zoomAll:(id)sender
11961196
[NSApp makeWindowsPerform:@selector(performZoom:) inOrder:YES];
11971197
}
11981198

1199-
- (IBAction)stayOnBottom:(id)sender
1199+
- (IBAction)stayInFront:(id)sender
12001200
{
1201-
ASLogDebug(@"Stay on bottom");
1201+
ASLogDebug(@"Stay in Front");
12021202
NSWindow *keyWindow = [NSApp keyWindow];
1203-
[keyWindow setLevel:kCGDesktopIconWindowLevel +1];
1203+
[keyWindow setLevel:NSFloatingWindowLevel];
12041204
}
12051205

1206-
- (IBAction)stayOnTop:(id)sender
1206+
- (IBAction)stayInBack:(id)sender
12071207
{
1208-
ASLogDebug(@"Stay on top");
1208+
ASLogDebug(@"Stay in Back");
12091209
NSWindow *keyWindow = [NSApp keyWindow];
1210-
[keyWindow setLevel:NSFloatingWindowLevel];
1210+
[keyWindow setLevel:kCGDesktopIconWindowLevel +1];
12111211
}
12121212

12131213
- (IBAction)stayLevelNormal:(id)sender

0 commit comments

Comments
 (0)