ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-15 01:25:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix horizontal split view not working (#23889)

Browse Source 
* Horizontal splitview sorta working

* remove the old element

* support getting size from model view container

* cleanup

* make splitViewHeight optional

* Update src/sql/azdata.proposed.d.ts

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>

* fix test

---------

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>
This commit is contained in:
Kim Santiago
2023-07-17 12:31:04 -10:00
committed by GitHub
parent 0e17a05985
commit eeab2b4abe
7 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/sql/workbench/browser/modelComponents/splitviewContainer.component.ts
View File

@@ -59,7 +59,7 @@ export default class SplitViewContainerImpl extends ContainerBase<FlexItemLayout
private _position: string;
private _splitView: SplitView;
private _orientation: Orientation;
private _splitViewHeight: number;
private _splitViewSize: number;
constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
@@ -103,8 +103,27 @@ export default class SplitViewContainerImpl extends ContainerBase<FlexItemLayout
this._position = layout.position ? layout.position : '';
this._height = convertSize(layout.height);
this._width = convertSize(layout.width);
this._orientation = layout.orientation.toLowerCase() === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
this._splitViewHeight = convertSizeToNumber(layout.splitViewHeight);
if (!layout.splitViewSize) {
// if no size was passed in for the split view, use the dimensions of the model view container
const modelViewContainer = document.getElementsByClassName('model-view-container')[0] as HTMLDivElement;
const modelViewContainerRect = modelViewContainer.getBoundingClientRect();
this._splitViewSize = layout.orientation.toLowerCase() === 'vertical' ? modelViewContainerRect.height : modelViewContainerRect.width;
} else {
this._splitViewSize = convertSizeToNumber(layout.splitViewSize);
}
const layoutOrientation = layout.orientation.toLowerCase() === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
if (this._orientation !== layoutOrientation) {
// have to recreate the splitview if the orientation changed because the SplitView needs the orientation when it's constructed for knowing
// which direction everyting should be (scrollbars, sashes, CSS classes), and these can't be swapped to the other orientation afterwards
this._splitView.el.remove();
this._splitView.dispose();
this._splitView = this._register(new SplitView(this._el.nativeElement, { orientation: layoutOrientation }));
this._orientation = layoutOrientation;
}
if (this._componentWrappers) {
this._componentWrappers.forEach(item => {
@@ -120,7 +139,8 @@ export default class SplitViewContainerImpl extends ContainerBase<FlexItemLayout
});
});
}
this._splitView.layout(this._splitViewHeight);
this._splitView.layout(this._splitViewSize);
}
// CSS-bound properties