ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Apply title bar adjustment to edit data (#5777)

Browse Source 
* apply title bar adjustment to edit data

* wi

* rework layout to be simplier

* fix layout
This commit is contained in:
Anthony Dresser
2019-05-31 12:03:52 -07:00
committed by GitHub
parent 1ccf408654
commit 5c520bc82e
1 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/sql/workbench/parts/editData/browser/editDataEditor.ts
View File

@@ -128,10 +128,11 @@ export class EditDataEditor extends BaseEditor {
/** /**
* Called to create the editor in the parent element. * Called to create the editor in the parent element.
*/ */
public createEditor(parent: HTMLElement): void { protected createEditor(parent: HTMLElement): void {
const parentElement = parent; parent.style.position = 'absolute';
DOM.addClass(parentElement, 'side-by-side-editor'); parent.style.height = '100%';
this._createTaskbar(parentElement); parent.style.width = '100%';
this._createTaskbar(parent);
} }
public dispose(): void { public dispose(): void {
@@ -276,7 +277,6 @@ export class EditDataEditor extends BaseEditor {
if (!input.results.container) { if (!input.results.container) {
this._resultsEditorContainer = DOM.append(parentElement, DOM.$('.editDataContainer-horizontal')); this._resultsEditorContainer = DOM.append(parentElement, DOM.$('.editDataContainer-horizontal'));
this._resultsEditorContainer.style.position = 'absolute';
input.results.container = this._resultsEditorContainer; input.results.container = this._resultsEditorContainer;
} else { } else {
@@ -306,7 +306,6 @@ export class EditDataEditor extends BaseEditor {
private _createSqlEditorContainer() { private _createSqlEditorContainer() {
const parentElement = this.getContainer(); const parentElement = this.getContainer();
this._sqlEditorContainer = DOM.append(parentElement, DOM.$('.details-editor-container')); this._sqlEditorContainer = DOM.append(parentElement, DOM.$('.details-editor-container'));
this._sqlEditorContainer.style.position = 'absolute';
} }
private _createTaskbar(parentElement: HTMLElement): void { private _createTaskbar(parentElement: HTMLElement): void {
@@ -403,52 +402,26 @@ export class EditDataEditor extends BaseEditor {
} }
private _doLayoutHorizontal(): void { private _doLayoutHorizontal(): void {
let splitPointTop: number = this._sash.getSplitPoint();
let parent: ClientRect = this.getContainer().getBoundingClientRect();
let sqlEditorHeight: number; let sqlEditorHeight: number;
let sqlEditorTop: number;
let resultsEditorHeight: number; let resultsEditorHeight: number;
let resultsEditorTop: number;
let editorTopOffset = parent.top + this._getTaskBarHeight();
this._resultsEditorContainer.hidden = false; this._resultsEditorContainer.hidden = false;
let titleBar = document.getElementById('workbench.parts.titlebar');
if (this.queryPaneEnabled()) { if (this.queryPaneEnabled()) {
const splitPointTop: number = this._sash.getSplitPoint();
this._sqlEditorContainer.hidden = false; this._sqlEditorContainer.hidden = false;
sqlEditorHeight = splitPointTop - this._getTaskBarHeight();
sqlEditorTop = editorTopOffset; resultsEditorHeight = this._dimension.height - this._getTaskBarHeight() - sqlEditorHeight;
sqlEditorHeight = splitPointTop - sqlEditorTop;
resultsEditorTop = splitPointTop;
resultsEditorHeight = parent.bottom - resultsEditorTop;
if (titleBar) {
sqlEditorHeight += DOM.getContentHeight(titleBar);
}
} else { } else {
this._sqlEditorContainer.hidden = true; this._sqlEditorContainer.hidden = true;
sqlEditorTop = editorTopOffset;
sqlEditorHeight = 0; sqlEditorHeight = 0;
resultsEditorHeight = this._dimension.height - this._getTaskBarHeight();
resultsEditorTop = editorTopOffset;
resultsEditorHeight = parent.bottom - resultsEditorTop;
if (titleBar) {
resultsEditorHeight += DOM.getContentHeight(titleBar);
}
} }
this._sqlEditorContainer.style.height = `${sqlEditorHeight}px`; this._sqlEditorContainer.style.height = `${sqlEditorHeight}px`;
this._sqlEditorContainer.style.width = `${this._dimension.width}px`; this._sqlEditorContainer.style.width = `${this._dimension.width}px`;
this._sqlEditorContainer.style.top = `${sqlEditorTop}px`;
this._resultsEditorContainer.style.height = `${resultsEditorHeight}px`; this._resultsEditorContainer.style.height = `${resultsEditorHeight}px`;
this._resultsEditorContainer.style.width = `${this._dimension.width}px`; this._resultsEditorContainer.style.width = `${this._dimension.width}px`;
this._resultsEditorContainer.style.top = `${resultsEditorTop}px`;
this._sqlEditor.layout(new DOM.Dimension(this._dimension.width, sqlEditorHeight)); this._sqlEditor.layout(new DOM.Dimension(this._dimension.width, sqlEditorHeight));
this._resultsEditor.layout(new DOM.Dimension(this._dimension.width, resultsEditorHeight)); this._resultsEditor.layout(new DOM.Dimension(this._dimension.width, resultsEditorHeight));