development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

bring zoomable title bar to macos (#155354)

Browse source 
bring zoomable menu bar to macos
fixes #149740
This commit is contained in:
SteVen Batten 2022-07-18 10:19:36 -07:00 committed by GitHub
parent 5acd9508c9
commit da2a179691
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/browser/part.ts
View file

@ -126,7 +126,7 @@ export abstract class Part extends Component implements ISerializableView {
//#region ISerializableView
private _onDidChange = this._register(new Emitter<IViewSize | undefined>());
protected _onDidChange = this._register(new Emitter<IViewSize | undefined>());
get onDidChange(): Event<IViewSize | undefined> { return this._onDidChange.event; }
element!: HTMLElement;

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

@ -50,8 +50,9 @@ export class TitlebarPart extends Part implements ITitleService {
readonly maximumWidth: number = Number.POSITIVE_INFINITY;
get minimumHeight(): number {
const value = this.isCommandCenterVisible ? 35 : 30;
return value / (this.currentMenubarVisibility === 'hidden' || getZoomFactor() < 1 ? getZoomFactor() : 1);
return value / (this.useCounterZoom ? getZoomFactor() : 1);
}
get maximumHeight(): number { return this.minimumHeight; }
//#endregion
@ -159,6 +160,7 @@ export class TitlebarPart extends Part implements ITitleService {
if (this.titleBarStyle !== 'native' && this.layoutControls && event.affectsConfiguration('workbench.layoutControl.enabled')) {
this.layoutControls.classList.toggle('show-layout-control', this.layoutControlEnabled);
this._onDidChange.fire(undefined);
}
if (event.affectsConfiguration(TitlebarPart.configCommandCenter)) {
@ -438,17 +440,26 @@ export class TitlebarPart extends Part implements ITitleService {
return this.configurationService.getValue<boolean>('workbench.layoutControl.enabled');
}
protected get useCounterZoom(): boolean {
// Prevent zooming behavior if any of the following conditions are met:
// 1. Shrinking below the window control size (zoom < 1)
// 2. No custom items are present in the title bar
const zoomFactor = getZoomFactor();
const noMenubar = this.currentMenubarVisibility === 'hidden' || (!isWeb && isMacintosh);
const noCommandCenter = !this.isCommandCenterVisible;
const noLayoutControls = !this.layoutControlEnabled;
return zoomFactor < 1 || (noMenubar && noCommandCenter && noLayoutControls);
}
updateLayout(dimension: Dimension): void {
this.lastLayoutDimensions = dimension;
if (getTitleBarStyle(this.configurationService) === 'custom') {
// Prevent zooming behavior if any of the following conditions are met:
// 1. Native macOS
// 2. Menubar is hidden
// 3. Shrinking below the window control size (zoom < 1)
const zoomFactor = getZoomFactor();
this.element.style.setProperty('--zoom-factor', zoomFactor.toString());
this.rootContainer.classList.toggle('counter-zoom', zoomFactor < 1 || (!isWeb && isMacintosh) || this.currentMenubarVisibility === 'hidden');
this.rootContainer.classList.toggle('counter-zoom', this.useCounterZoom);
runAtThisOrScheduleAtNextAnimationFrame(() => this.adjustTitleMarginToCenter());

3
src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
View file

@ -43,7 +43,8 @@ export class TitlebarPart extends BrowserTitleBarPart {
if (!isMacintosh) {
return super.minimumHeight;
}
return (this.isCommandCenterVisible ? 35 : this.getMacTitlebarSize()) / getZoomFactor();
return (this.isCommandCenterVisible ? 35 : this.getMacTitlebarSize()) / (this.useCounterZoom ? getZoomFactor() : 1);
}
override get maximumHeight(): number { return this.minimumHeight; }