Merge pull request microsoft#61965 from usernamehw/align-badge-color

roblourens · web-flow · commit 4626bc0e1b67 · 2018-10-28T20:16:30.000-07:00
Align badge theming with the GUI badge
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -269,7 +269,7 @@ export class PreferencesEditor extends BaseEditor {
 			this.sideBySidePreferencesWidget.setResultCount(count.target, count.count);
 		} else if (this.searchWidget.getValue()) {
 			if (countValue === 0) {
-				this.searchWidget.showMessage(nls.localize('noSettingsFound', "No Results"), countValue);
+				this.searchWidget.showMessage(nls.localize('noSettingsFound', "No Settings Found"), countValue);
 			} else if (countValue === 1) {
 				this.searchWidget.showMessage(nls.localize('oneSettingFound', "1 Setting Found"), countValue);
 			} else {
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
@@ -25,7 +25,7 @@ import { ConfigurationTarget } from 'vs/platform/configuration/common/configurat
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { activeContrastBorder, badgeBackground, badgeForeground, contrastBorder, errorForeground, focusBorder } from 'vs/platform/theme/common/colorRegistry';
+import { activeContrastBorder, badgeBackground, badgeForeground, contrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry';
 import { attachInputBoxStyler, attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -614,7 +614,8 @@ export class SearchWidget extends Widget {
 				this.countElement.style.borderStyle = border ? 'solid' : null;
 				this.countElement.style.borderColor = border;
 
-				this.styleCountElementForeground();
+				const color = this.themeService.getTheme().getColor(badgeForeground);
+				this.countElement.style.color = color ? color.toString() : null;
 			}));
 		}
 
@@ -650,18 +651,10 @@ export class SearchWidget extends Widget {
 		if (this.countElement && message !== this.countElement.textContent) {
 			this.countElement.textContent = message;
 			this.inputBox.inputElement.setAttribute('aria-label', message);
-			DOM.toggleClass(this.countElement, 'no-results', count === 0);
 			this.inputBox.inputElement.style.paddingRight = this.getControlsWidth() + 'px';
-			this.styleCountElementForeground();
 		}
 	}
 
-	private styleCountElementForeground() {
-		const colorId = DOM.hasClass(this.countElement, 'no-results') ? errorForeground : badgeForeground;
-		const color = this.themeService.getTheme().getColor(colorId);
-		this.countElement.style.color = color ? color.toString() : null;
-	}
-
 	public layout(dimension: DOM.Dimension) {
 		if (dimension.width < 400) {
 			if (this.countElement) {
