From 937eba4edb9c095f55196f7e35f36c6bfcfef10b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 30 Aug 2016 00:29:44 +0200 Subject: [PATCH] Fixes #10650: Remember max rendered match count width --- src/vs/editor/contrib/find/browser/findWidget.css | 1 - src/vs/editor/contrib/find/browser/findWidget.ts | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/browser/findWidget.css index 3865e84c359..f80e0f456cc 100644 --- a/src/vs/editor/contrib/find/browser/findWidget.css +++ b/src/vs/editor/contrib/find/browser/findWidget.css @@ -115,7 +115,6 @@ display: inline-block; margin: 0 1px 0 3px; padding: 2px 2px 0 2px; - min-width: 69px; height: 25px; vertical-align: middle; box-sizing: border-box; diff --git a/src/vs/editor/contrib/find/browser/findWidget.ts b/src/vs/editor/contrib/find/browser/findWidget.ts index 11f46a02584..74044d8acc5 100644 --- a/src/vs/editor/contrib/find/browser/findWidget.ts +++ b/src/vs/editor/contrib/find/browser/findWidget.ts @@ -43,6 +43,8 @@ const NLS_MATCHES_COUNT_LIMIT_TITLE = nls.localize('title.matchesCountLimit', "O const NLS_MATCHES_LOCATION = nls.localize('label.matchesLocation', "{0} of {1}"); const NLS_NO_RESULTS = nls.localize('label.noResults', "No results"); +let MAX_MATCHES_COUNT_WIDTH = 69; + export class FindWidget extends Widget implements IOverlayWidget { private static ID = 'editor.contrib.findWidget'; @@ -200,6 +202,7 @@ export class FindWidget extends Widget implements IOverlayWidget { } private _updateMatchesCount(): void { + this._matchesCount.style.minWidth = MAX_MATCHES_COUNT_WIDTH + 'px'; if (this._state.matchesCount >= MATCHES_LIMIT) { this._matchesCount.title = NLS_MATCHES_COUNT_LIMIT_TITLE; } else { @@ -226,6 +229,8 @@ export class FindWidget extends Widget implements IOverlayWidget { label = NLS_NO_RESULTS; } this._matchesCount.appendChild(document.createTextNode(label)); + + MAX_MATCHES_COUNT_WIDTH = Math.max(MAX_MATCHES_COUNT_WIDTH, this._matchesCount.clientWidth); } // ----- actions -- GitLab