Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

ux - take activity bar out of zooming

Browse Source
This commit is contained in:
Benjamin Pasero
2016-11-10 16:06:03 +01:00
parent 4a6b92723d
commit 24a7875b04
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/browser/layout.ts
View File

@@ -17,7 +17,6 @@ import { IEventService } from 'vs/platform/event/common/event';
import { IThemeService } from 'vs/workbench/services/themes/common/themeService';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { getZoomFactor } from 'vs/base/browser/browser';
const DEFAULT_MIN_SIDEBAR_PART_WIDTH = 170;
@@ -91,9 +90,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@IEditorGroupService private editorGroupService: IEditorGroupService,
@IPartService private partService: IPartService,
@IConfigurationService configurationService: IConfigurationService,
@IViewletService private viewletService: IViewletService,
@IThemeService themeService: IThemeService
@IThemeService themeService: IThemeService,
) {
this.parent = parent;
this.workbenchContainer = workbenchContainer;
@@ -360,7 +358,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
let sidebarSize = new Dimension(sidebarWidth, this.sidebarHeight);
// Activity Bar
this.activitybarWidth = isActivityBarHidden ? 0 : this.computedStyles.activitybar.width;
this.activitybarWidth = isActivityBarHidden ? 0 : this.initialComputedStyles.activitybar.width / getZoomFactor(); // adjust for zoom prevention
let activityBarSize = new Dimension(this.activitybarWidth, sidebarSize.height);
// Panel part
@@ -480,7 +478,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
}
// Activity Bar Part
this.activitybar.getContainer().size(null, activityBarSize.height);
this.activitybar.getContainer().size(activityBarSize.width, activityBarSize.height);
if (sidebarPosition === Position.LEFT) {
this.activitybar.getContainer().getHTMLElement().style.right = '';
this.activitybar.getContainer().position(this.titlebarHeight, null, 0, 0);