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

affectsConfiguration adoption #171660

Merged
merged 1 commit into from Jan 18, 2023
Merged

affectsConfiguration adoption #171660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/vs/platform/windows/electron-main/windowImpl.ts
View file
Open in desktop
Expand Up @@ -910,10 +910,12 @@ export class CodeWindow extends Disposable implements ICodeWindow {
private onConfigurationUpdated(e?: IConfigurationChangeEvent): void {

// Menubar
const newMenuBarVisibility = this.getMenuBarVisibility();
if (newMenuBarVisibility !== this.currentMenuBarVisibility) {
this.currentMenuBarVisibility = newMenuBarVisibility;
this.setMenuBarVisibility(newMenuBarVisibility);
if (!e || e.affectsConfiguration('window.menuBarVisibility')) {
const newMenuBarVisibility = this.getMenuBarVisibility();
if (newMenuBarVisibility !== this.currentMenuBarVisibility) {
this.currentMenuBarVisibility = newMenuBarVisibility;
this.setMenuBarVisibility(newMenuBarVisibility);
}
}

// Proxy
Expand Down
12 changes: 11 additions & 1 deletion src/vs/workbench/browser/layout.ts
View file
Open in desktop
Expand Up @@ -274,7 +274,17 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
});

// Configuration changes
this._register(this.configurationService.onDidChangeConfiguration(() => this.doUpdateLayoutConfiguration()));
this._register(this.configurationService.onDidChangeConfiguration((e) => {
if ([
LegacyWorkbenchLayoutSettings.ACTIVITYBAR_VISIBLE,
LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION,
LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE,
'window.menuBarVisibility',
'window.titleBarStyle',
].some(setting => e.affectsConfiguration(setting))) {
this.doUpdateLayoutConfiguration();
}
}));

// Fullscreen changes
this._register(onDidChangeFullscreen(() => this.onFullscreenChanged()));
Expand Down