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

fix dimensions of the query editor (#5910)

Browse Source
This commit is contained in:
Anthony Dresser
2019-06-06 12:31:12 -07:00
committed by Karl Burtram
parent 68328f65b5
commit 76a84a2cf4
4 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/base/browser/ui/panel/panel.ts
View File

@@ -297,7 +297,6 @@ export class TabbedPanel extends Disposable {
if (dimension) { if (dimension) {
this._currentDimensions = dimension; this._currentDimensions = dimension;
this.parent.style.height = dimension.height + 'px'; this.parent.style.height = dimension.height + 'px';
this.parent.style.height = dimension.width + 'px';
this.header.style.width = dimension.width + 'px'; this.header.style.width = dimension.width + 'px';
this.body.style.width = dimension.width + 'px'; this.body.style.width = dimension.width + 'px';
const bodyHeight = dimension.height - (this._headerVisible ? this.headersize : 0); const bodyHeight = dimension.height - (this._headerVisible ? this.headersize : 0);

5
src/sql/base/browser/ui/taskbar/media/taskbar.css
View File

@@ -19,7 +19,10 @@
.carbon-taskbar { .carbon-taskbar {
width: 100%; width: 100%;
position: relative; position: relative;
margin: 2px 0px 2px 0px; }
.carbon-taskbar .monaco-action-bar {
padding: 2px 0px 2px 0px;
} }
.carbon-taskbar.monaco-toolbar .monaco-action-bar.animated .actions-container { .carbon-taskbar.monaco-toolbar .monaco-action-bar.animated .actions-container {

25
src/sql/workbench/parts/query/browser/media/queryEditor.css
View File

@@ -3,27 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
.vs-dark .side-by-side-editor > .master-editor-container { .query-editor-view {
box-shadow: -6px 0 5px -5px black; width: 100%;
}
.side-by-side-editor > .master-editor-container {
box-shadow: -6px 0 5px -5px #DDD;
}
.vs-dark .side-by-side-editor > .master-editor-container-horizontal {
box-shadow: 0 -6px 5px -5px black;
}
.side-by-side-editor > .master-editor-container-horizontal {
box-shadow: 0 -6px 5px -5px #DDD;
}
.editDataEditor {
height: inherit
}
#chartViewerDiv .chartViewer {
display: flex;
flex-direction: column;
} }

11
src/sql/workbench/parts/query/browser/queryEditor.ts
View File

@@ -57,6 +57,7 @@ export class QueryEditor extends BaseEditor {
private textFileEditorContainer: HTMLElement; private textFileEditorContainer: HTMLElement;
private taskbar: Taskbar; private taskbar: Taskbar;
private splitviewContainer: HTMLElement;
private splitview: SplitView; private splitview: SplitView;
private inputDisposables: IDisposable[] = []; private inputDisposables: IDisposable[] = [];
@@ -100,13 +101,13 @@ export class QueryEditor extends BaseEditor {
public createEditor(parent: HTMLElement): void { public createEditor(parent: HTMLElement): void {
DOM.addClass(parent, 'query-editor'); DOM.addClass(parent, 'query-editor');
let splitviewContainer = DOM.$('.query-editor-view'); this.splitviewContainer = DOM.$('.query-editor-view');
this.createTaskbar(parent); this.createTaskbar(parent);
parent.appendChild(splitviewContainer); parent.appendChild(this.splitviewContainer);
this.splitview = this._register(new SplitView(splitviewContainer, { orientation: Orientation.VERTICAL })); this.splitview = this._register(new SplitView(this.splitviewContainer, { orientation: Orientation.VERTICAL }));
this._register(this.splitview.onDidSashReset(() => this.splitview.distributeViewSizes())); this._register(this.splitview.onDidSashReset(() => this.splitview.distributeViewSizes()));
// We create two separate editors - one for Untitled Documents (ad-hoc queries) and another for queries from // We create two separate editors - one for Untitled Documents (ad-hoc queries) and another for queries from
@@ -344,7 +345,9 @@ export class QueryEditor extends BaseEditor {
*/ */
public layout(dimension: DOM.Dimension): void { public layout(dimension: DOM.Dimension): void {
this.dimension = dimension; this.dimension = dimension;
this.splitview.layout(dimension.height - 31); const queryEditorHeight = dimension.height - DOM.getTotalHeight(this.taskbar.getContainer());
this.splitviewContainer.style.height = queryEditorHeight + 'px';
this.splitview.layout(queryEditorHeight);
} }
/** /**