From a9a01ae479460af810853e7709c072db75bb1e95 Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Tue, 11 Sep 2018 12:18:03 -0700 Subject: [PATCH] fixes a rendering problem in splitview (#2512) --- .../browser/ui/scrollableSplitview/scrollableSplitview.ts | 5 ++++- src/sql/parts/query/editor/gridPanel.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts b/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts index a260a71c58..10c735bb76 100644 --- a/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts +++ b/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts @@ -331,8 +331,11 @@ export class ScrollableSplitView extends HeightMap implements IDisposable { } layout(size: number): void { - const previousSize = Math.max(this.size, this.contentSize); + const previousSize = this.size; this.size = size; + this.contentSize = 0; + this.lastRenderHeight = undefined; + this.lastRenderTop = undefined; this.resize(this.viewItems.length - 1, size - previousSize); } diff --git a/src/sql/parts/query/editor/gridPanel.ts b/src/sql/parts/query/editor/gridPanel.ts index e0f2e5ae57..d08af71f57 100644 --- a/src/sql/parts/query/editor/gridPanel.ts +++ b/src/sql/parts/query/editor/gridPanel.ts @@ -17,6 +17,8 @@ import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelect import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { escape } from 'sql/base/common/strings'; import { hyperLinkFormatter, textFormatter } from 'sql/parts/grid/services/sharedServices'; +import { CopyKeybind } from 'sql/base/browser/ui/table/plugins/copyKeybind.plugin'; +import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin'; import * as sqlops from 'sqlops'; @@ -38,8 +40,6 @@ import { Dimension, getContentWidth } from 'vs/base/browser/dom'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { CopyKeybind } from 'sql/base/browser/ui/table/plugins/copyKeybind.plugin'; -import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin'; const ROW_HEIGHT = 29; const HEADER_HEIGHT = 26;