From 93f3483c33a0bd1d1785e0c80988bc636b58bff8 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 16 Feb 2017 23:12:11 +0100 Subject: [PATCH] Render minimap to the left of the scrollbar --- src/vs/editor/browser/view/viewImpl.ts | 2 +- src/vs/editor/browser/viewParts/minimap/minimap.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index fd8d8b4bbd0..8b1b0241d33 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/src/vs/editor/browser/view/viewImpl.ts @@ -482,7 +482,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp StyleMutator.setHeight(this.linesContent, 1000000); StyleMutator.setLeft(this.linesContentContainer, layoutInfo.contentLeft); - StyleMutator.setWidth(this.linesContentContainer, layoutInfo.contentWidth); + StyleMutator.setWidth(this.linesContentContainer, layoutInfo.contentWidth + layoutInfo.minimapWidth); StyleMutator.setHeight(this.linesContentContainer, layoutInfo.contentHeight); this.outgoingEvents.emitViewLayoutChanged(layoutInfo); diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts index a597b75dd40..4eb51147d19 100644 --- a/src/vs/editor/browser/viewParts/minimap/minimap.ts +++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts @@ -390,7 +390,7 @@ export class Minimap extends ViewPart { this._domNode = createFastDomNode(document.createElement('div')); this._domNode.setPosition('absolute'); - this._domNode.setRight(0); + this._domNode.setRight(this._context.configuration.editor.layoutInfo.verticalScrollbarWidth); this._canvas = createFastDomNode(document.createElement('canvas')); this._canvas.setPosition('absolute'); -- GitLab