mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
Merge VS Code 1.26.1 (#2394)
* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
This commit is contained in:
Karl Burtram
@@ -6,76 +6,61 @@
|
||||
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import * as errors from 'vs/base/common/errors';
|
||||
import { Part } from 'vs/workbench/browser/part';
|
||||
import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickOpenController';
|
||||
import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
|
||||
import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash';
|
||||
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||
import { IPartService, Position, ILayoutOptions, Parts } from 'vs/workbench/services/part/common/partService';
|
||||
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
|
||||
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
|
||||
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
||||
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
|
||||
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
|
||||
import { getZoomFactor } from 'vs/base/browser/browser';
|
||||
import { Disposable } from 'vs/base/common/lifecycle';
|
||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { isMacintosh } from 'vs/base/common/platform';
|
||||
import { memoize } from 'vs/base/common/decorators';
|
||||
import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
|
||||
import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
|
||||
import { Dimension, getClientArea, size, position, hide, show } from 'vs/base/browser/dom';
|
||||
import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
|
||||
import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
|
||||
import { TitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
|
||||
import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart';
|
||||
import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
|
||||
import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
|
||||
import { StatusbarPart } from 'vs/workbench/browser/parts/statusbar/statusbarPart';
|
||||
import { getZoomFactor } from 'vs/base/browser/browser';
|
||||
|
||||
const MIN_SIDEBAR_PART_WIDTH = 170;
|
||||
const DEFAULT_SIDEBAR_PART_WIDTH = 300;
|
||||
const MIN_EDITOR_PART_HEIGHT = 70;
|
||||
const MIN_EDITOR_PART_WIDTH = 220;
|
||||
const MIN_PANEL_PART_HEIGHT = 77;
|
||||
const DEFAULT_PANEL_PART_SIZE = 350;
|
||||
const MIN_PANEL_PART_WIDTH = 300;
|
||||
const DEFAULT_PANEL_SIZE_COEFFICIENT = 0.4;
|
||||
const PANEL_SIZE_BEFORE_MAXIMIZED_BOUNDARY = 0.7;
|
||||
const HIDE_SIDEBAR_WIDTH_THRESHOLD = 50;
|
||||
const HIDE_PANEL_HEIGHT_THRESHOLD = 50;
|
||||
const HIDE_PANEL_WIDTH_THRESHOLD = 100;
|
||||
const TITLE_BAR_HEIGHT = 22;
|
||||
const TITLE_BAR_HEIGHT = isMacintosh ? 22 : 30;
|
||||
const STATUS_BAR_HEIGHT = 22;
|
||||
const ACTIVITY_BAR_WIDTH = 50;
|
||||
|
||||
interface PartLayoutInfo {
|
||||
titlebar: { height: number; };
|
||||
activitybar: { width: number; };
|
||||
sidebar: { minWidth: number; };
|
||||
panel: { minHeight: number; minWidth: number; };
|
||||
editor: { minWidth: number; minHeight: number; };
|
||||
statusbar: { height: number; };
|
||||
}
|
||||
const MIN_SIDEBAR_PART_WIDTH = 170;
|
||||
const DEFAULT_SIDEBAR_PART_WIDTH = 300;
|
||||
const HIDE_SIDEBAR_WIDTH_THRESHOLD = 50;
|
||||
|
||||
const MIN_PANEL_PART_HEIGHT = 77;
|
||||
const MIN_PANEL_PART_WIDTH = 300;
|
||||
const DEFAULT_PANEL_PART_SIZE = 350;
|
||||
const DEFAULT_PANEL_SIZE_COEFFICIENT = 0.4;
|
||||
const PANEL_SIZE_BEFORE_MAXIMIZED_BOUNDARY = 0.7;
|
||||
const HIDE_PANEL_HEIGHT_THRESHOLD = 50;
|
||||
const HIDE_PANEL_WIDTH_THRESHOLD = 100;
|
||||
|
||||
/**
|
||||
* The workbench layout is responsible to lay out all parts that make the Workbench.
|
||||
*/
|
||||
export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider {
|
||||
export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider {
|
||||
|
||||
private static readonly sashXOneWidthSettingsKey = 'workbench.sidebar.width';
|
||||
private static readonly sashXTwoWidthSettingsKey = 'workbench.panel.width';
|
||||
private static readonly sashYHeightSettingsKey = 'workbench.panel.height';
|
||||
private static readonly panelSizeBeforeMaximizedKey = 'workbench.panel.sizeBeforeMaximized';
|
||||
|
||||
private parent: HTMLElement;
|
||||
private workbenchContainer: HTMLElement;
|
||||
private titlebar: Part;
|
||||
private activitybar: Part;
|
||||
private editor: Part;
|
||||
private sidebar: Part;
|
||||
private panel: Part;
|
||||
private statusbar: Part;
|
||||
private quickopen: QuickOpenController;
|
||||
private quickInput: QuickInputService;
|
||||
private notificationsCenter: NotificationsCenter;
|
||||
private notificationsToasts: NotificationsToasts;
|
||||
private toUnbind: IDisposable[];
|
||||
private workbenchSize: Dimension;
|
||||
|
||||
private sashXOne: Sash;
|
||||
private sashXTwo: Sash;
|
||||
private sashY: Sash;
|
||||
|
||||
private _sidebarWidth: number;
|
||||
private sidebarHeight: number;
|
||||
private titlebarHeight: number;
|
||||
@@ -84,80 +69,81 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
private panelMaximized: boolean;
|
||||
private _panelHeight: number;
|
||||
private _panelWidth: number;
|
||||
private layoutEditorGroupsVertically: boolean;
|
||||
|
||||
// Take parts as an object bag since instatation service does not have typings for constructors with 9+ arguments
|
||||
constructor(
|
||||
parent: HTMLElement,
|
||||
workbenchContainer: HTMLElement,
|
||||
parts: {
|
||||
titlebar: Part,
|
||||
activitybar: Part,
|
||||
editor: Part,
|
||||
sidebar: Part,
|
||||
panel: Part,
|
||||
statusbar: Part
|
||||
private parent: HTMLElement,
|
||||
private workbenchContainer: HTMLElement,
|
||||
private parts: {
|
||||
titlebar: TitlebarPart,
|
||||
activitybar: ActivitybarPart,
|
||||
editor: EditorPart,
|
||||
sidebar: SidebarPart,
|
||||
panel: PanelPart,
|
||||
statusbar: StatusbarPart
|
||||
},
|
||||
quickopen: QuickOpenController,
|
||||
quickInput: QuickInputService,
|
||||
notificationsCenter: NotificationsCenter,
|
||||
notificationsToasts: NotificationsToasts,
|
||||
private quickopen: QuickOpenController,
|
||||
private quickInput: QuickInputService,
|
||||
private notificationsCenter: NotificationsCenter,
|
||||
private notificationsToasts: NotificationsToasts,
|
||||
@IStorageService private storageService: IStorageService,
|
||||
@IContextViewService private contextViewService: IContextViewService,
|
||||
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
|
||||
@IEditorGroupService private editorGroupService: IEditorGroupService,
|
||||
@IPartService private partService: IPartService,
|
||||
@IViewletService private viewletService: IViewletService,
|
||||
@IThemeService themeService: IThemeService
|
||||
@IThemeService private themeService: IThemeService,
|
||||
@IEditorGroupsService private editorGroupService: IEditorGroupsService
|
||||
) {
|
||||
this.parent = parent;
|
||||
this.workbenchContainer = workbenchContainer;
|
||||
this.titlebar = parts.titlebar;
|
||||
this.activitybar = parts.activitybar;
|
||||
this.editor = parts.editor;
|
||||
this.sidebar = parts.sidebar;
|
||||
this.panel = parts.panel;
|
||||
this.statusbar = parts.statusbar;
|
||||
this.quickopen = quickopen;
|
||||
this.quickInput = quickInput;
|
||||
this.notificationsCenter = notificationsCenter;
|
||||
this.notificationsToasts = notificationsToasts;
|
||||
this.toUnbind = [];
|
||||
this.panelSizeBeforeMaximized = this.storageService.getInteger(WorkbenchLayout.panelSizeBeforeMaximizedKey, StorageScope.GLOBAL, 0);
|
||||
this.panelMaximized = false;
|
||||
super();
|
||||
|
||||
this.sashXOne = new Sash(this.workbenchContainer, this, {
|
||||
baseSize: 5
|
||||
});
|
||||
// Restore state
|
||||
this.restorePreviousState();
|
||||
|
||||
this.sashXTwo = new Sash(this.workbenchContainer, this, {
|
||||
baseSize: 5
|
||||
});
|
||||
// Create layout sashes
|
||||
this.sashXOne = new Sash(this.workbenchContainer, this);
|
||||
this.sashXTwo = new Sash(this.workbenchContainer, this);
|
||||
this.sashY = new Sash(this.workbenchContainer, this, { orientation: Orientation.HORIZONTAL });
|
||||
|
||||
this.sashY = new Sash(this.workbenchContainer, this, {
|
||||
baseSize: 4,
|
||||
orientation: Orientation.HORIZONTAL
|
||||
});
|
||||
this.registerListeners();
|
||||
}
|
||||
|
||||
private restorePreviousState(): void {
|
||||
this._sidebarWidth = Math.max(this.partLayoutInfo.sidebar.minWidth, this.storageService.getInteger(WorkbenchLayout.sashXOneWidthSettingsKey, StorageScope.GLOBAL, DEFAULT_SIDEBAR_PART_WIDTH));
|
||||
this._panelHeight = Math.max(this.partLayoutInfo.panel.minHeight, this.storageService.getInteger(WorkbenchLayout.sashYHeightSettingsKey, StorageScope.GLOBAL, DEFAULT_PANEL_PART_SIZE));
|
||||
|
||||
this._panelWidth = Math.max(this.partLayoutInfo.panel.minWidth, this.storageService.getInteger(WorkbenchLayout.sashXTwoWidthSettingsKey, StorageScope.GLOBAL, DEFAULT_PANEL_PART_SIZE));
|
||||
this._panelHeight = Math.max(this.partLayoutInfo.panel.minHeight, this.storageService.getInteger(WorkbenchLayout.sashYHeightSettingsKey, StorageScope.GLOBAL, DEFAULT_PANEL_PART_SIZE));
|
||||
|
||||
this.layoutEditorGroupsVertically = (this.editorGroupService.getGroupOrientation() !== 'horizontal');
|
||||
this.panelMaximized = false;
|
||||
this.panelSizeBeforeMaximized = this.storageService.getInteger(WorkbenchLayout.panelSizeBeforeMaximizedKey, StorageScope.GLOBAL, 0);
|
||||
}
|
||||
|
||||
this.toUnbind.push(themeService.onThemeChange(_ => this.layout()));
|
||||
this.toUnbind.push(editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
|
||||
this.toUnbind.push(editorGroupService.onGroupOrientationChanged(e => this.onGroupOrientationChanged()));
|
||||
private registerListeners(): void {
|
||||
this._register(this.themeService.onThemeChange(_ => this.layout()));
|
||||
this._register(this.parts.editor.onDidSizeConstraintsChange(() => this.onDidEditorSizeConstraintsChange()));
|
||||
|
||||
this.registerSashListeners();
|
||||
}
|
||||
|
||||
private get editorCountForHeight(): number {
|
||||
return Math.max(1, this.editorGroupService.getGroupOrientation() === 'horizontal' ? this.editorGroupService.getStacksModel().groups.length : 1);
|
||||
}
|
||||
private onDidEditorSizeConstraintsChange(): void {
|
||||
if (this.workbenchSize && (this.sidebarWidth || this.panelHeight)) {
|
||||
if (this.editorGroupService.count > 1) {
|
||||
const minimumEditorPartSize = new Dimension(this.parts.editor.minimumWidth, this.parts.editor.minimumHeight);
|
||||
|
||||
private get editorCountForWidth(): number {
|
||||
return Math.max(1, this.editorGroupService.getGroupOrientation() === 'vertical' ? this.editorGroupService.getStacksModel().groups.length : 1);
|
||||
const sidebarOverflow = this.workbenchSize.width - this.sidebarWidth < minimumEditorPartSize.width;
|
||||
|
||||
let panelOverflow = false;
|
||||
if (this.partService.getPanelPosition() === Position.RIGHT) {
|
||||
panelOverflow = this.workbenchSize.width - this.panelWidth - this.sidebarWidth < minimumEditorPartSize.width;
|
||||
} else {
|
||||
panelOverflow = this.workbenchSize.height - this.panelHeight < minimumEditorPartSize.height;
|
||||
}
|
||||
|
||||
// Trigger a layout if we detect that either sidebar or panel overflow
|
||||
// as a matter of a new editor group being added to the editor part
|
||||
if (sidebarOverflow || panelOverflow) {
|
||||
this.layout();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private get activitybarWidth(): number {
|
||||
@@ -195,12 +181,22 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
private computeMaxPanelWidth(): number {
|
||||
const minSidebarSize = this.partService.isVisible(Parts.SIDEBAR_PART) ? (this.partService.getSideBarPosition() === Position.LEFT ? this.partLayoutInfo.sidebar.minWidth : this.sidebarWidth) : 0;
|
||||
return Math.max(this.partLayoutInfo.panel.minWidth, this.workbenchSize.width - this.editorCountForWidth * this.partLayoutInfo.editor.minWidth - minSidebarSize - this.activitybarWidth);
|
||||
let minSidebarWidth: number;
|
||||
if (this.partService.isVisible(Parts.SIDEBAR_PART)) {
|
||||
if (this.partService.getSideBarPosition() === Position.LEFT) {
|
||||
minSidebarWidth = this.partLayoutInfo.sidebar.minWidth;
|
||||
} else {
|
||||
minSidebarWidth = this.sidebarWidth;
|
||||
}
|
||||
} else {
|
||||
minSidebarWidth = 0;
|
||||
}
|
||||
|
||||
return Math.max(this.partLayoutInfo.panel.minWidth, this.workbenchSize.width - this.parts.editor.minimumWidth - minSidebarWidth - this.activitybarWidth);
|
||||
}
|
||||
|
||||
private computeMaxPanelHeight(): number {
|
||||
return Math.max(this.partLayoutInfo.panel.minHeight, this.sidebarHeight - this.editorCountForHeight * this.partLayoutInfo.editor.minHeight);
|
||||
return Math.max(this.partLayoutInfo.panel.minHeight, this.sidebarHeight /* simplification for: window.height - status.height - title-height */ - this.parts.editor.minimumHeight);
|
||||
}
|
||||
|
||||
private get sidebarWidth(): number {
|
||||
@@ -213,12 +209,13 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
|
||||
private set sidebarWidth(value: number) {
|
||||
const panelMinWidth = this.partService.getPanelPosition() === Position.RIGHT && this.partService.isVisible(Parts.PANEL_PART) ? this.partLayoutInfo.panel.minWidth : 0;
|
||||
const maxSidebarWidth = this.workbenchSize.width - this.activitybarWidth - this.editorCountForWidth * this.partLayoutInfo.editor.minWidth - panelMinWidth;
|
||||
const maxSidebarWidth = this.workbenchSize.width - this.activitybarWidth - this.parts.editor.minimumWidth - panelMinWidth;
|
||||
|
||||
this._sidebarWidth = Math.max(this.partLayoutInfo.sidebar.minWidth, Math.min(maxSidebarWidth, value));
|
||||
}
|
||||
|
||||
@memoize
|
||||
private get partLayoutInfo(): PartLayoutInfo {
|
||||
public get partLayoutInfo() {
|
||||
return {
|
||||
titlebar: {
|
||||
height: TITLE_BAR_HEIGHT
|
||||
@@ -233,10 +230,6 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
minHeight: MIN_PANEL_PART_HEIGHT,
|
||||
minWidth: MIN_PANEL_PART_WIDTH
|
||||
},
|
||||
editor: {
|
||||
minWidth: MIN_EDITOR_PART_WIDTH,
|
||||
minHeight: MIN_EDITOR_PART_HEIGHT
|
||||
},
|
||||
statusbar: {
|
||||
height: STATUS_BAR_HEIGHT
|
||||
}
|
||||
@@ -251,22 +244,22 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
let startPanelHeight: number;
|
||||
let startPanelWidth: number;
|
||||
|
||||
this.toUnbind.push(this.sashXOne.onDidStart((e: ISashEvent) => {
|
||||
this._register(this.sashXOne.onDidStart((e: ISashEvent) => {
|
||||
startSidebarWidth = this.sidebarWidth;
|
||||
startX = e.startX;
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashY.onDidStart((e: ISashEvent) => {
|
||||
this._register(this.sashY.onDidStart((e: ISashEvent) => {
|
||||
startPanelHeight = this.panelHeight;
|
||||
startY = e.startY;
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashXTwo.onDidStart((e: ISashEvent) => {
|
||||
this._register(this.sashXTwo.onDidStart((e: ISashEvent) => {
|
||||
startPanelWidth = this.panelWidth;
|
||||
startXTwo = e.startX;
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashXOne.onDidChange((e: ISashEvent) => {
|
||||
this._register(this.sashXOne.onDidChange((e: ISashEvent) => {
|
||||
let doLayout = false;
|
||||
let sidebarPosition = this.partService.getSideBarPosition();
|
||||
let isSidebarVisible = this.partService.isVisible(Parts.SIDEBAR_PART);
|
||||
@@ -306,7 +299,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashY.onDidChange((e: ISashEvent) => {
|
||||
this._register(this.sashY.onDidChange((e: ISashEvent) => {
|
||||
let doLayout = false;
|
||||
let isPanelVisible = this.partService.isVisible(Parts.PANEL_PART);
|
||||
let newSashHeight = startPanelHeight - (e.currentY - startY);
|
||||
@@ -344,7 +337,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashXTwo.onDidChange((e: ISashEvent) => {
|
||||
this._register(this.sashXTwo.onDidChange((e: ISashEvent) => {
|
||||
let doLayout = false;
|
||||
let isPanelVisible = this.partService.isVisible(Parts.PANEL_PART);
|
||||
let newSashWidth = startPanelWidth - (e.currentX - startXTwo);
|
||||
@@ -382,25 +375,25 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashXOne.onDidEnd(() => {
|
||||
this._register(this.sashXOne.onDidEnd(() => {
|
||||
this.storageService.store(WorkbenchLayout.sashXOneWidthSettingsKey, this.sidebarWidth, StorageScope.GLOBAL);
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashY.onDidEnd(() => {
|
||||
this._register(this.sashY.onDidEnd(() => {
|
||||
this.storageService.store(WorkbenchLayout.sashYHeightSettingsKey, this.panelHeight, StorageScope.GLOBAL);
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashXTwo.onDidEnd(() => {
|
||||
this._register(this.sashXTwo.onDidEnd(() => {
|
||||
this.storageService.store(WorkbenchLayout.sashXTwoWidthSettingsKey, this.panelWidth, StorageScope.GLOBAL);
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashY.onDidReset(() => {
|
||||
this._register(this.sashY.onDidReset(() => {
|
||||
this.panelHeight = this.sidebarHeight * DEFAULT_PANEL_SIZE_COEFFICIENT;
|
||||
this.storageService.store(WorkbenchLayout.sashYHeightSettingsKey, this.panelHeight, StorageScope.GLOBAL);
|
||||
this.layout();
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashXOne.onDidReset(() => {
|
||||
this._register(this.sashXOne.onDidReset(() => {
|
||||
let activeViewlet = this.viewletService.getActiveViewlet();
|
||||
let optimalWidth = activeViewlet && activeViewlet.getOptimalWidth();
|
||||
this.sidebarWidth = Math.max(optimalWidth, DEFAULT_SIDEBAR_PART_WIDTH);
|
||||
@@ -408,45 +401,14 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
this.partService.setSideBarHidden(false).done(() => this.layout(), errors.onUnexpectedError);
|
||||
}));
|
||||
|
||||
this.toUnbind.push(this.sashXTwo.onDidReset(() => {
|
||||
this._register(this.sashXTwo.onDidReset(() => {
|
||||
this.panelWidth = (this.workbenchSize.width - this.sidebarWidth - this.activitybarWidth) * DEFAULT_PANEL_SIZE_COEFFICIENT;
|
||||
this.storageService.store(WorkbenchLayout.sashXTwoWidthSettingsKey, this.panelWidth, StorageScope.GLOBAL);
|
||||
this.layout();
|
||||
}));
|
||||
}
|
||||
|
||||
private onEditorsChanged(): void {
|
||||
|
||||
// Make sure that we layout properly in case we detect that the sidebar or panel is large enought to cause
|
||||
// multiple opened editors to go below minimal size. The fix is to trigger a layout for any editor
|
||||
// input change that falls into this category.
|
||||
if (this.workbenchSize && (this.sidebarWidth || this.panelHeight)) {
|
||||
let visibleEditors = this.editorService.getVisibleEditors().length;
|
||||
const panelVertical = this.partService.getPanelPosition() === Position.RIGHT;
|
||||
if (visibleEditors > 1) {
|
||||
const sidebarOverflow = this.layoutEditorGroupsVertically && (this.workbenchSize.width - this.sidebarWidth < visibleEditors * this.partLayoutInfo.editor.minWidth);
|
||||
const panelOverflow = !this.layoutEditorGroupsVertically && !panelVertical && (this.workbenchSize.height - this.panelHeight < visibleEditors * this.partLayoutInfo.editor.minHeight) ||
|
||||
panelVertical && this.layoutEditorGroupsVertically && (this.workbenchSize.width - this.panelWidth - this.sidebarWidth < visibleEditors * this.partLayoutInfo.editor.minWidth);
|
||||
|
||||
if (sidebarOverflow || panelOverflow) {
|
||||
this.layout();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private onGroupOrientationChanged(): void {
|
||||
const newLayoutEditorGroupsVertically = (this.editorGroupService.getGroupOrientation() !== 'horizontal');
|
||||
|
||||
const doLayout = this.layoutEditorGroupsVertically !== newLayoutEditorGroupsVertically;
|
||||
this.layoutEditorGroupsVertically = newLayoutEditorGroupsVertically;
|
||||
|
||||
if (doLayout) {
|
||||
this.layout();
|
||||
}
|
||||
}
|
||||
|
||||
public layout(options?: ILayoutOptions): void {
|
||||
layout(options?: ILayoutOptions): void {
|
||||
this.workbenchSize = getClientArea(this.parent);
|
||||
|
||||
const isActivityBarHidden = !this.partService.isVisible(Parts.ACTIVITYBAR_PART);
|
||||
@@ -456,6 +418,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
const isSidebarHidden = !this.partService.isVisible(Parts.SIDEBAR_PART);
|
||||
const sidebarPosition = this.partService.getSideBarPosition();
|
||||
const panelPosition = this.partService.getPanelPosition();
|
||||
const menubarVisibility = this.partService.getMenubarVisibility();
|
||||
|
||||
// Sidebar
|
||||
if (this.sidebarWidth === -1) {
|
||||
@@ -463,7 +426,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
this.statusbarHeight = isStatusbarHidden ? 0 : this.partLayoutInfo.statusbar.height;
|
||||
this.titlebarHeight = isTitlebarHidden ? 0 : this.partLayoutInfo.titlebar.height / getZoomFactor(); // adjust for zoom prevention
|
||||
this.titlebarHeight = isTitlebarHidden ? 0 : this.partLayoutInfo.titlebar.height / (!menubarVisibility || menubarVisibility === 'hidden' ? getZoomFactor() : 1); // adjust for zoom prevention
|
||||
|
||||
this.sidebarHeight = this.workbenchSize.height - this.statusbarHeight - this.titlebarHeight;
|
||||
let sidebarSize = new Dimension(this.sidebarWidth, this.sidebarHeight);
|
||||
@@ -525,41 +488,45 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
editorSize.width = this.workbenchSize.width - sidebarSize.width - activityBarSize.width - (panelPosition === Position.RIGHT ? panelDimension.width : 0);
|
||||
editorSize.height = sidebarSize.height - (panelPosition === Position.BOTTOM ? panelDimension.height : 0);
|
||||
|
||||
// Assert Sidebar and Editor Size to not overflow
|
||||
let editorMinWidth = this.partLayoutInfo.editor.minWidth;
|
||||
let editorMinHeight = this.partLayoutInfo.editor.minHeight;
|
||||
let visibleEditorCount = this.editorService.getVisibleEditors().length;
|
||||
if (visibleEditorCount > 1) {
|
||||
if (this.layoutEditorGroupsVertically) {
|
||||
editorMinWidth *= visibleEditorCount; // when editors layout vertically, multiply the min editor width by number of visible editors
|
||||
} else {
|
||||
editorMinHeight *= visibleEditorCount; // when editors layout horizontally, multiply the min editor height by number of visible editors
|
||||
// Adjust for Editor Part minimum width
|
||||
const minimumEditorPartSize = new Dimension(this.parts.editor.minimumWidth, this.parts.editor.minimumHeight);
|
||||
if (editorSize.width < minimumEditorPartSize.width) {
|
||||
const missingPreferredEditorWidth = minimumEditorPartSize.width - editorSize.width;
|
||||
let outstandingMissingPreferredEditorWidth = missingPreferredEditorWidth;
|
||||
|
||||
// Take from Panel if Panel Position on the Right and Visible
|
||||
if (!isPanelHidden && panelPosition === Position.RIGHT && (!options || options.source !== Parts.PANEL_PART)) {
|
||||
const oldPanelWidth = panelDimension.width;
|
||||
panelDimension.width = Math.max(this.partLayoutInfo.panel.minWidth, panelDimension.width - outstandingMissingPreferredEditorWidth);
|
||||
outstandingMissingPreferredEditorWidth -= oldPanelWidth - panelDimension.width;
|
||||
}
|
||||
|
||||
// Take from Sidebar if Visible
|
||||
if (!isSidebarHidden && outstandingMissingPreferredEditorWidth > 0) {
|
||||
const oldSidebarWidth = sidebarSize.width;
|
||||
sidebarSize.width = Math.max(this.partLayoutInfo.sidebar.minWidth, sidebarSize.width - outstandingMissingPreferredEditorWidth);
|
||||
outstandingMissingPreferredEditorWidth -= oldSidebarWidth - sidebarSize.width;
|
||||
}
|
||||
|
||||
editorSize.width += missingPreferredEditorWidth - outstandingMissingPreferredEditorWidth;
|
||||
if (!isPanelHidden && panelPosition === Position.BOTTOM) {
|
||||
panelDimension.width = editorSize.width; // ensure panel width is always following editor width
|
||||
}
|
||||
}
|
||||
|
||||
if (editorSize.width < editorMinWidth) {
|
||||
let diff = editorMinWidth - editorSize.width;
|
||||
editorSize.width = editorMinWidth;
|
||||
if (panelPosition === Position.BOTTOM) {
|
||||
panelDimension.width = editorMinWidth;
|
||||
} else if (panelDimension.width >= diff && (!options || options.source !== Parts.PANEL_PART)) {
|
||||
const oldWidth = panelDimension.width;
|
||||
panelDimension.width = Math.max(this.partLayoutInfo.panel.minWidth, panelDimension.width - diff);
|
||||
diff = diff - (oldWidth - panelDimension.width);
|
||||
// Adjust for Editor Part minimum height
|
||||
if (editorSize.height < minimumEditorPartSize.height) {
|
||||
const missingPreferredEditorHeight = minimumEditorPartSize.height - editorSize.height;
|
||||
let outstandingMissingPreferredEditorHeight = missingPreferredEditorHeight;
|
||||
|
||||
// Take from Panel if Panel Position on the Bottom and Visible
|
||||
if (!isPanelHidden && panelPosition === Position.BOTTOM) {
|
||||
const oldPanelHeight = panelDimension.height;
|
||||
panelDimension.height = Math.max(this.partLayoutInfo.panel.minHeight, panelDimension.height - outstandingMissingPreferredEditorHeight);
|
||||
outstandingMissingPreferredEditorHeight -= oldPanelHeight - panelDimension.height;
|
||||
}
|
||||
|
||||
if (sidebarSize.width >= diff) {
|
||||
sidebarSize.width -= diff;
|
||||
sidebarSize.width = Math.max(this.partLayoutInfo.sidebar.minWidth, sidebarSize.width);
|
||||
}
|
||||
}
|
||||
|
||||
if (editorSize.height < editorMinHeight && panelPosition === Position.BOTTOM) {
|
||||
let diff = editorMinHeight - editorSize.height;
|
||||
editorSize.height = editorMinHeight;
|
||||
|
||||
panelDimension.height -= diff;
|
||||
panelDimension.height = Math.max(this.partLayoutInfo.panel.minHeight, panelDimension.height);
|
||||
editorSize.height += missingPreferredEditorHeight - outstandingMissingPreferredEditorHeight;
|
||||
}
|
||||
|
||||
if (!isSidebarHidden) {
|
||||
@@ -591,7 +558,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
// Title Part
|
||||
const titleContainer = this.titlebar.getContainer();
|
||||
const titleContainer = this.parts.titlebar.getContainer();
|
||||
if (isTitlebarHidden) {
|
||||
hide(titleContainer);
|
||||
} else {
|
||||
@@ -599,8 +566,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
// Editor Part and Panel part
|
||||
const editorContainer = this.editor.getContainer();
|
||||
const panelContainer = this.panel.getContainer();
|
||||
const editorContainer = this.parts.editor.getContainer();
|
||||
const panelContainer = this.parts.panel.getContainer();
|
||||
size(editorContainer, editorSize.width, editorSize.height);
|
||||
size(panelContainer, panelDimension.width, panelDimension.height);
|
||||
|
||||
@@ -623,13 +590,13 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
// Activity Bar Part
|
||||
const activitybarContainer = this.activitybar.getContainer();
|
||||
const activitybarContainer = this.parts.activitybar.getContainer();
|
||||
size(activitybarContainer, null, activityBarSize.height);
|
||||
if (sidebarPosition === Position.LEFT) {
|
||||
this.activitybar.getContainer().style.right = '';
|
||||
this.parts.activitybar.getContainer().style.right = '';
|
||||
position(activitybarContainer, this.titlebarHeight, null, 0, 0);
|
||||
} else {
|
||||
this.activitybar.getContainer().style.left = '';
|
||||
this.parts.activitybar.getContainer().style.left = '';
|
||||
position(activitybarContainer, this.titlebarHeight, 0, 0, null);
|
||||
}
|
||||
if (isActivityBarHidden) {
|
||||
@@ -639,7 +606,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
// Sidebar Part
|
||||
const sidebarContainer = this.sidebar.getContainer();
|
||||
const sidebarContainer = this.parts.sidebar.getContainer();
|
||||
size(sidebarContainer, sidebarSize.width, sidebarSize.height);
|
||||
const editorAndPanelWidth = editorSize.width + (panelPosition === Position.RIGHT ? panelWidth : 0);
|
||||
if (sidebarPosition === Position.LEFT) {
|
||||
@@ -649,7 +616,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
// Statusbar Part
|
||||
const statusbarContainer = this.statusbar.getContainer();
|
||||
const statusbarContainer = this.parts.statusbar.getContainer();
|
||||
position(statusbarContainer, this.workbenchSize.height - this.statusbarHeight);
|
||||
if (isStatusbarHidden) {
|
||||
hide(statusbarContainer);
|
||||
@@ -680,21 +647,21 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
|
||||
// Propagate to Part Layouts
|
||||
this.titlebar.layout(new Dimension(this.workbenchSize.width, this.titlebarHeight));
|
||||
this.editor.layout(new Dimension(editorSize.width, editorSize.height));
|
||||
this.sidebar.layout(sidebarSize);
|
||||
this.panel.layout(panelDimension);
|
||||
this.activitybar.layout(activityBarSize);
|
||||
this.parts.titlebar.layout(new Dimension(this.workbenchSize.width, this.titlebarHeight));
|
||||
this.parts.editor.layout(new Dimension(editorSize.width, editorSize.height));
|
||||
this.parts.sidebar.layout(sidebarSize);
|
||||
this.parts.panel.layout(panelDimension);
|
||||
this.parts.activitybar.layout(activityBarSize);
|
||||
|
||||
// Propagate to Context View
|
||||
this.contextViewService.layout();
|
||||
}
|
||||
|
||||
public getVerticalSashTop(sash: Sash): number {
|
||||
getVerticalSashTop(sash: Sash): number {
|
||||
return this.titlebarHeight;
|
||||
}
|
||||
|
||||
public getVerticalSashLeft(sash: Sash): number {
|
||||
getVerticalSashLeft(sash: Sash): number {
|
||||
let sidebarPosition = this.partService.getSideBarPosition();
|
||||
if (sash === this.sashXOne) {
|
||||
|
||||
@@ -708,7 +675,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
return this.workbenchSize.width - this.panelWidth - (sidebarPosition === Position.RIGHT ? this.sidebarWidth + this.activitybarWidth : 0);
|
||||
}
|
||||
|
||||
public getVerticalSashHeight(sash: Sash): number {
|
||||
getVerticalSashHeight(sash: Sash): number {
|
||||
if (sash === this.sashXTwo && !this.partService.isVisible(Parts.PANEL_PART)) {
|
||||
return 0;
|
||||
}
|
||||
@@ -716,12 +683,12 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
return this.sidebarHeight;
|
||||
}
|
||||
|
||||
public getHorizontalSashTop(sash: Sash): number {
|
||||
// Horizontal sash should be a bit lower than the editor area, thus add 2px #5524
|
||||
return 2 + (this.partService.isVisible(Parts.PANEL_PART) ? this.sidebarHeight - this.panelHeight + this.titlebarHeight : this.sidebarHeight + this.titlebarHeight);
|
||||
getHorizontalSashTop(sash: Sash): number {
|
||||
const offset = 2; // Horizontal sash should be a bit lower than the editor area, thus add 2px #5524
|
||||
return offset + (this.partService.isVisible(Parts.PANEL_PART) ? this.sidebarHeight - this.panelHeight + this.titlebarHeight : this.sidebarHeight + this.titlebarHeight);
|
||||
}
|
||||
|
||||
public getHorizontalSashLeft(sash: Sash): number {
|
||||
getHorizontalSashLeft(sash: Sash): number {
|
||||
if (this.partService.getSideBarPosition() === Position.RIGHT) {
|
||||
return 0;
|
||||
}
|
||||
@@ -729,28 +696,27 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
return this.sidebarWidth + this.activitybarWidth;
|
||||
}
|
||||
|
||||
public getHorizontalSashWidth(sash: Sash): number {
|
||||
getHorizontalSashWidth(sash: Sash): number {
|
||||
return this.panelWidth;
|
||||
}
|
||||
|
||||
public isPanelMaximized(): boolean {
|
||||
isPanelMaximized(): boolean {
|
||||
return this.panelMaximized;
|
||||
}
|
||||
|
||||
// change part size along the main axis
|
||||
public resizePart(part: Parts, sizeChange: number): void {
|
||||
resizePart(part: Parts, sizeChange: number): void {
|
||||
const panelPosition = this.partService.getPanelPosition();
|
||||
const sizeChangePxWidth = this.workbenchSize.width * (sizeChange / 100);
|
||||
const sizeChangePxHeight = this.workbenchSize.height * (sizeChange / 100);
|
||||
|
||||
let doLayout = false;
|
||||
|
||||
switch (part) {
|
||||
case Parts.SIDEBAR_PART:
|
||||
this.sidebarWidth = this.sidebarWidth + sizeChangePxWidth; // Sidebar can not become smaller than MIN_PART_WIDTH
|
||||
|
||||
if (this.layoutEditorGroupsVertically && (this.workbenchSize.width - this.sidebarWidth < this.editorCountForWidth * MIN_EDITOR_PART_WIDTH)) {
|
||||
this.sidebarWidth = (this.workbenchSize.width - this.editorCountForWidth * MIN_EDITOR_PART_WIDTH);
|
||||
if (this.workbenchSize.width - this.sidebarWidth < this.parts.editor.minimumWidth) {
|
||||
this.sidebarWidth = this.workbenchSize.width - this.parts.editor.minimumWidth;
|
||||
}
|
||||
|
||||
doLayout = true;
|
||||
@@ -767,7 +733,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
case Parts.EDITOR_PART:
|
||||
// If we have one editor we can cheat and resize sidebar with the negative delta
|
||||
// If the sidebar is not visible and panel is, resize panel main axis with negative Delta
|
||||
if (this.editorCountForWidth === 1) {
|
||||
if (this.editorGroupService.count === 1) {
|
||||
if (this.partService.isVisible(Parts.SIDEBAR_PART)) {
|
||||
this.sidebarWidth = this.sidebarWidth - sizeChangePxWidth;
|
||||
doLayout = true;
|
||||
@@ -779,13 +745,11 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
}
|
||||
doLayout = true;
|
||||
}
|
||||
|
||||
} else {
|
||||
const stacks = this.editorGroupService.getStacksModel();
|
||||
const activeGroup = stacks.positionOfGroup(stacks.activeGroup);
|
||||
const activeGroup = this.editorGroupService.activeGroup;
|
||||
|
||||
this.editorGroupService.resizeGroup(activeGroup, sizeChangePxWidth);
|
||||
doLayout = false;
|
||||
const activeGroupSize = this.editorGroupService.getSize(activeGroup);
|
||||
this.editorGroupService.setSize(activeGroup, activeGroupSize + sizeChangePxWidth);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -793,11 +757,4 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
|
||||
this.layout();
|
||||
}
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
if (this.toUnbind) {
|
||||
dispose(this.toUnbind);
|
||||
this.toUnbind = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user