From 76a84a2cf495f2e0fffa0e66d42794f1779e1967 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <anthonydresserdev@gmail.com>
Date: Thu, 6 Jun 2019 12:31:12 -0700
Subject: [PATCH] fix dimensions of the query editor (#5910)

---
 src/sql/base/browser/ui/panel/panel.ts        |  1 -
 .../base/browser/ui/taskbar/media/taskbar.css |  5 +++-
 .../parts/query/browser/media/queryEditor.css | 25 ++-----------------
 .../parts/query/browser/queryEditor.ts        | 11 +++++---
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/sql/base/browser/ui/panel/panel.ts b/src/sql/base/browser/ui/panel/panel.ts
index 1eb5614c5a..e800bdff13 100644
--- a/src/sql/base/browser/ui/panel/panel.ts
+++ b/src/sql/base/browser/ui/panel/panel.ts
@@ -297,7 +297,6 @@ export class TabbedPanel extends Disposable {
 		if (dimension) {
 			this._currentDimensions = dimension;
 			this.parent.style.height = dimension.height + 'px';
-			this.parent.style.height = dimension.width + 'px';
 			this.header.style.width = dimension.width + 'px';
 			this.body.style.width = dimension.width + 'px';
 			const bodyHeight = dimension.height - (this._headerVisible ? this.headersize : 0);
diff --git a/src/sql/base/browser/ui/taskbar/media/taskbar.css b/src/sql/base/browser/ui/taskbar/media/taskbar.css
index 2e7d53c00e..79f96dd60b 100644
--- a/src/sql/base/browser/ui/taskbar/media/taskbar.css
+++ b/src/sql/base/browser/ui/taskbar/media/taskbar.css
@@ -19,7 +19,10 @@
 .carbon-taskbar {
 	width: 100%;
 	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 {
diff --git a/src/sql/workbench/parts/query/browser/media/queryEditor.css b/src/sql/workbench/parts/query/browser/media/queryEditor.css
index 2a6587e565..bd6afe6122 100644
--- a/src/sql/workbench/parts/query/browser/media/queryEditor.css
+++ b/src/sql/workbench/parts/query/browser/media/queryEditor.css
@@ -3,27 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.vs-dark .side-by-side-editor > .master-editor-container {
-	box-shadow: -6px 0 5px -5px black;
-}
-
-.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;
+.query-editor-view {
+	width: 100%;
 }
\ No newline at end of file
diff --git a/src/sql/workbench/parts/query/browser/queryEditor.ts b/src/sql/workbench/parts/query/browser/queryEditor.ts
index 0322402dfa..e377c37bb2 100644
--- a/src/sql/workbench/parts/query/browser/queryEditor.ts
+++ b/src/sql/workbench/parts/query/browser/queryEditor.ts
@@ -57,6 +57,7 @@ export class QueryEditor extends BaseEditor {
 	private textFileEditorContainer: HTMLElement;
 
 	private taskbar: Taskbar;
+	private splitviewContainer: HTMLElement;
 	private splitview: SplitView;
 
 	private inputDisposables: IDisposable[] = [];
@@ -100,13 +101,13 @@ export class QueryEditor extends BaseEditor {
 	public createEditor(parent: HTMLElement): void {
 		DOM.addClass(parent, 'query-editor');
 
-		let splitviewContainer = DOM.$('.query-editor-view');
+		this.splitviewContainer = DOM.$('.query-editor-view');
 
 		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()));
 
 		// 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 {
 		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);
 	}
 
 	/**