From 63fc2e0f7c4ccdcebac26f2ca775c28a1951dddc Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Fri, 25 Jan 2019 17:26:04 +0100 Subject: [PATCH] tree horizontal scrolling: wrap up debug hover and repl --- src/vs/workbench/parts/debug/browser/media/debugHover.css | 5 ++++- src/vs/workbench/parts/debug/electron-browser/debugHover.ts | 2 +- src/vs/workbench/parts/debug/electron-browser/repl.ts | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/debug/browser/media/debugHover.css b/src/vs/workbench/parts/debug/browser/media/debugHover.css index 2f1115e52df29..2813a7377e03d 100644 --- a/src/vs/workbench/parts/debug/browser/media/debugHover.css +++ b/src/vs/workbench/parts/debug/browser/media/debugHover.css @@ -36,7 +36,6 @@ .monaco-editor .debug-hover-widget .debug-hover-tree .monaco-list-row .monaco-tl-contents { user-select: text; - white-space: pre; } /* Disable tree highlight in debug hover tree. */ @@ -60,6 +59,10 @@ max-height: 500px; } +.monaco-editor .debug-hover-widget .monaco-tl-contents .value { + white-space: nowrap; +} + .monaco-editor .debug-hover-widget .error { color: #E51400; } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts index b07b5f084696f..061d9a72a1bab 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts @@ -255,7 +255,7 @@ export class DebugHoverWidget implements IContentWidget { private layoutTreeAndContainer(): void { const treeHeight = Math.min(MAX_TREE_HEIGHT, this.tree.visibleNodeCount * 18); this.treeContainer.style.height = `${treeHeight}px`; - this.tree.layout(treeHeight); + this.tree.layout(treeHeight, 324); } hide(): void { diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts index e88a79861c7bf..45f77ae9975b4 100644 --- a/src/vs/workbench/parts/debug/electron-browser/repl.ts +++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts @@ -358,7 +358,8 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati accessibilityProvider: new ReplAccessibilityProvider(), identityProvider: { getId: element => element.getId() }, mouseSupport: false, - keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: e => e } + keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: e => e }, + horizontalScrolling: false }, this.contextKeyService, this.listService, this.themeService, this.configurationService, this.keybindingService); this.toDispose.push(this.tree.onContextMenu(e => this.onContextMenu(e)));