Merge branch 'master' into tyriar/hot_exit/14068_load_backups_on_main_process

src/vs/code/electron-main/menus.ts

@@ -92,6 +92,7 @@ export class VSCodeMenu {
 		});
 
 		// Listen to some events from window service
+		this.windowsService.onPathOpen(path => this.updateMenu());
 		this.windowsService.onRecentPathsChange(paths => this.updateMenu());
 		this.windowsService.onWindowClose(_ => this.onClose(this.windowsService.getWindowCount()));
 

src/vs/code/electron-main/windows.ts

@@ -90,6 +90,7 @@ export interface IWindowsMainService {
 	// events
 	onWindowReady: CommonEvent<VSCodeWindow>;
 	onWindowClose: CommonEvent<number>;
+	onPathOpen: CommonEvent<IPath>;
 	onRecentPathsChange: CommonEvent<void>;
 
 	// methods
@@ -143,6 +144,9 @@ export class WindowsManager implements IWindowsMainService {
 	private _onWindowClose = new Emitter<number>();
 	onWindowClose: CommonEvent<number> = this._onWindowClose.event;
 
+	private _onPathOpen = new Emitter<IPath>();
+	onPathOpen: CommonEvent<IPath> = this._onPathOpen.event;
+
 	constructor(
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@ILogService private logService: ILogService,
@@ -509,6 +513,9 @@ export class WindowsManager implements IWindowsMainService {
 		// Register new paths for backup
 		this.backupService.pushWorkspaceBackupPathsSync(iPathsToOpen.filter(p => p.workspacePath).map(p => Uri.file(p.workspacePath)));
 
+		// Emit events
+		iPathsToOpen.forEach(iPath => this._onPathOpen.fire(iPath));
+
 		return arrays.distinct(usedWindows);
 	}
 

src/vs/workbench/browser/layout.ts

@@ -91,7 +91,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IPartService private partService: IPartService,
 		@IViewletService private viewletService: IViewletService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService themeService: IThemeService
 	) {
 		this.parent = parent;
 		this.workbenchContainer = workbenchContainer;
@@ -358,7 +358,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		let sidebarSize = new Dimension(sidebarWidth, this.sidebarHeight);
 
 		// Activity Bar
-		this.activitybarWidth = isActivityBarHidden ? 0 : this.initialComputedStyles.activitybar.width / getZoomFactor(); // adjust for zoom prevention
+		this.activitybarWidth = isActivityBarHidden ? 0 : this.computedStyles.activitybar.width;
 		let activityBarSize = new Dimension(this.activitybarWidth, sidebarSize.height);
 
 		// Panel part
@@ -478,8 +478,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		}
 
 		// Activity Bar Part
-		this.activitybar.getContainer().size(activityBarSize.width, activityBarSize.height);
-
+		this.activitybar.getContainer().size(null, activityBarSize.height);
 		if (sidebarPosition === Position.LEFT) {
 			this.activitybar.getContainer().getHTMLElement().style.right = '';
 			this.activitybar.getContainer().position(this.titlebarHeight, null, 0, 0);

src/vs/workbench/browser/parts/activitybar/media/activityaction.css

@@ -17,13 +17,12 @@
 	margin-right: 0;
 	padding: 0 0 0 50px;
 	box-sizing: border-box;
-	background-position: center center;
+	background-position: 9px center;
 	background-repeat: no-repeat;
 	opacity: 0.6;
 	font-size: 15px;
 	color: white;
 	text-shadow: 0 1px 0 rgba(0, 0, 0, 0.8);
-	zoom: reset; /* prevent zooming */
 }
 
 .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {

src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css

@@ -14,7 +14,6 @@
 .monaco-workbench > .activitybar > .content .monaco-action-bar {
 	text-align: left;
 	background-color: inherit;
-	zoom: reset; /* prevent zooming */
 }
 
 .vs .monaco-workbench > .activitybar > .content {