development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix menubar visibility events when moving menubar (#153179)

Browse source 
fixes #151063
This commit is contained in:
SteVen Batten 2022-06-24 16:49:32 -07:00 committed by GitHub
parent 551cf46204
commit 09c5a6ed48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/base/browser/ui/menu/menubar.ts
View file

@ -746,7 +746,7 @@ export class MenuBar extends Disposable {
this._onFocusStateChange.fire(this.focusState >= MenubarState.FOCUSED);
}
private get isVisible(): boolean {
get isVisible(): boolean {
return this.focusState >= MenubarState.VISIBLE;
}

5
src/vs/workbench/browser/parts/titlebar/menubarControl.ts
View file

@ -698,6 +698,11 @@ export class CustomMenubarControl extends MenubarControl {
}));
this.reinstallDisposables.add(attachMenuStyler(this.menubar, this.themeService));
// Fire visibility change for the first install if menu is shown
if (this.menubar.isVisible) {
this.onDidVisibilityChange(true);
}
} else {
this.menubar?.update(this.getMenuBarOptions());
}

10
src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
View file

@ -180,7 +180,9 @@ export class TitlebarPart extends Part implements ITitleService {
protected onMenubarVisibilityChanged(visible: boolean): void {
if (isWeb || isWindows || isLinux) {
this.adjustTitleMarginToCenter();
if (this.lastLayoutDimensions) {
this.layout(this.lastLayoutDimensions.width, this.lastLayoutDimensions.height);
}
this._onMenubarVisibilityChange.fire(visible);
}
@ -197,6 +199,8 @@ export class TitlebarPart extends Part implements ITitleService {
this.menubar.remove();
this.menubar = undefined;
}
this.onMenubarVisibilityChanged(false);
}
protected installMenubar(): void {
@ -210,9 +214,9 @@ export class TitlebarPart extends Part implements ITitleService {
this.menubar = this.rootContainer.insertBefore($('div.menubar'), this.title);
this.menubar.setAttribute('role', 'menubar');
this.customMenubar.create(this.menubar);
this._register(this.customMenubar.onVisibilityChange(e => this.onMenubarVisibilityChanged(e)));
this.customMenubar.create(this.menubar);
}
private updateTitle(): void {