development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #14576

Browse source
This commit is contained in:
Benjamin Pasero 2016-10-27 08:56:10 +02:00
parent 0e4fa466b1
commit 3d03839d8d
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
View file

@ -193,10 +193,18 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
return this.silosSize[position] === this.minSize && this.silosMinimized[position];
}
private updateMinimizedState(): void {
private enableMinimizedState(): void {
POSITIONS.forEach(p => this.silosMinimized[p] = this.silosSize[p] === this.minSize);
}
private updateMinimizedState(): void {
POSITIONS.forEach(p => {
if (this.silosSize[p] !== this.minSize) {
this.silosMinimized[p] = false; // release silo from minimized state if it was sized large enough
}
});
}
private get snapToMinimizeThresholdSize(): number {
return this.layoutVertically ? SideBySideEditorControl.SNAP_TO_MINIMIZED_THRESHOLD_WIDTH : SideBySideEditorControl.SNAP_TO_MINIMIZED_THRESHOLD_HEIGHT;
}
@ -461,7 +469,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// Since we triggered a change in minimized/maximized editors, we need
// to update our stored state of minimized silos accordingly
this.updateMinimizedState();
this.enableMinimizedState();
if (layout) {
this.layoutContainers();
@ -805,7 +813,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// Since we triggered a change in minimized/maximized editors, we need
// to update our stored state of minimized silos accordingly
this.updateMinimizedState();
this.enableMinimizedState();
// Layout silos
this.layoutControl(this.dimension);
@ -1590,7 +1598,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// We allow silos to turn into minimized state from user dragging the sash,
// so we need to update our stored state of minimized silos accordingly
this.updateMinimizedState();
this.enableMinimizedState();
// Pass on to containers
this.layoutContainers();
@ -1658,7 +1666,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// We allow silos to turn into minimized state from user dragging the sash,
// so we need to update our stored state of minimized silos accordingly
this.updateMinimizedState();
this.enableMinimizedState();
// Pass on to containers
this.layoutContainers();
@ -1757,7 +1765,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// When restoring from an initial ratio state, we treat editors of min-size as
// minimized, so we need to update our stored state of minimized silos accordingly
if (wasInitialRatioRestored) {
this.updateMinimizedState();
this.enableMinimizedState();
}
// Compensate for overflow either through rounding error or min editor size
@ -1841,6 +1849,9 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
POSITIONS.forEach(position => {
this.getTitleAreaControl(position).layout();
});
// Update minimized state
this.updateMinimizedState();
}
private layoutEditor(position: Position): void {