Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add window.nonNativeFullscreen option for macOS #55267

Merged
merged 14 commits into from Oct 25, 2018
Merged

Add window.nonNativeFullscreen option for macOS #55267

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
83deba1
window.nonNativeFullscreen uses simpleFullScreen on macOS
ignu Jul 27, 2018
2edf933
Handle edge-case where user edits prefs while in fullscreen and can n…
ignu Jul 27, 2018
1358cde
change 'nonNativeFullscreen' to 'nativeFullscreen' and invert the def…
ignu Aug 7, 2018
ed11a34
Prevent maximize button from going to native fullscreen if nativeFull…
ignu Aug 7, 2018
41cd80e
Fix focus getting lost after simpleFullScreen and encapsulate more of…
ignu Aug 9, 2018
8837be9
Fix missing whitespace for eslint
ignu Aug 9, 2018
e3b6c12
Merge remote-tracking branch 'upstream/master' into non-native-fullsc…
bpasero Oct 8, 2018
6f1ae71
:lipstick:
bpasero Oct 8, 2018
8ecc7a3
restart properly when setting changes
bpasero Oct 8, 2018
521f5f6
Merge remote-tracking branch 'origin/master' into non-native-fullscreen
ignu Oct 15, 2018
2b86094
Handle screen resolution changes when in SimpleFullscreen
ignu Oct 16, 2018
a32dfba
Merge remote-tracking branch 'upstream/master' into non-native-fullsc…
bpasero Oct 25, 2018
249a34b
Merge remote-tracking branch 'upstream/master' into non-native-fullsc…
bpasero Oct 25, 2018
9667519
fix issues to be merged
bpasero Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/vs/code/electron-main/window.ts
View file
Open in desktop
Expand Up @@ -824,11 +824,19 @@ export class CodeWindow implements ICodeWindow {
return { x: pos[0], y: pos[1], width: dimension[0], height: dimension[1] };
}


toggleFullScreen(): void {
const willBeFullScreen = !this._win.isFullScreen();
const windowConfig = this.configurationService.getValue<IWindowSettings>('window');

// set fullscreen flag on window
this._win.setFullScreen(willBeFullScreen);
if (windowConfig && windowConfig.nonNativeFullscreen) {
const willBeFullScreen = !this._win.isSimpleFullScreen();
this._win.setFullScreen(false);
this._win.setSimpleFullScreen(willBeFullScreen);
} else {
const willBeFullScreen = !this._win.isFullScreen();
this._win.setSimpleFullScreen(false);
this._win.setFullScreen(willBeFullScreen);
}

// respect configured menu bar visibility or default to toggle if not set
this.setMenuBarVisibility(this.currentMenuBarVisibility, false);
Expand Down
1 change: 1 addition & 0 deletions src/vs/platform/windows/common/windows.ts
View file
Open in desktop
Expand Up @@ -242,6 +242,7 @@ export interface IWindowSettings {
menuBarVisibility: MenuBarVisibility;
newWindowDimensions: 'default' | 'inherit' | 'maximized' | 'fullscreen';
nativeTabs: boolean;
nonNativeFullscreen: boolean;
enableMenuBarMnemonics: boolean;
closeWhenEmpty: boolean;
smoothScrollingWorkaround: boolean;
Expand Down
6 changes: 6 additions & 0 deletions src/vs/workbench/electron-browser/main.contribution.ts
View file
Open in desktop
Expand Up @@ -644,6 +644,12 @@ configurationRegistry.registerConfiguration({
'description': nls.localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured."),
'included': isMacintosh && parseFloat(os.release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
},
'window.nonNativeFullscreen': {
'type': 'boolean',
'default': false,
'description': nls.localize('window.nonNativeFullscreen', "Uses non-native (or simple) fullscreen as to not create a new space when fullscreen is toggled."),
'included': isMacintosh
},
'window.smoothScrollingWorkaround': {
'type': 'boolean',
'default': false,
Expand Down