development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Icons in problems view show black when not focused (#174487)

Browse source 
* Icons in problems view show black when not focused

* update smoke test
This commit is contained in:
Martin Aeschlimann 2023-02-15 22:34:14 +01:00 committed by GitHub
parent e5779739cd
commit dc619de8d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/platform/severityIcon/browser/media/severityIcon.css
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
.monaco-editor .zone-widget .codicon.codicon-error,
.markers-panel .marker-icon.codicon.codicon-error,
.markers-panel .marker-icon.error, .markers-panel .marker-icon .codicon.codicon-error,
.text-search-provider-messages .providerMessage .codicon.codicon-error,
.extensions-viewlet > .extensions .codicon.codicon-error,
.extension-editor .codicon.codicon-error,
@ -13,7 +13,7 @@
}
.monaco-editor .zone-widget .codicon.codicon-warning,
.markers-panel .marker-icon.codicon.codicon-warning,
.markers-panel .marker-icon.warning, .markers-panel .marker-icon .codicon.codicon-warning,
.text-search-provider-messages .providerMessage .codicon.codicon-warning,
.extensions-viewlet > .extensions .codicon.codicon-warning,
.extension-editor .codicon.codicon-warning,
@ -22,7 +22,7 @@
}
.monaco-editor .zone-widget .codicon.codicon-info,
.markers-panel .marker-icon.codicon.codicon-info,
.markers-panel .marker-icon.info, .markers-panel .marker-icon .codicon.codicon-info,
.text-search-provider-messages .providerMessage .codicon.codicon-info,
.extensions-viewlet > .extensions .codicon.codicon-info,
.extension-editor .codicon.codicon-info,

12
src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
View file

@ -50,6 +50,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
import { MarkersContextKeys, MarkersViewMode } from 'vs/workbench/contrib/markers/common/markers';
import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
import { defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
import Severity from 'vs/base/common/severity';
interface IResourceMarkersTemplateData {
readonly resourceLabel: IResourceLabel;
@ -270,6 +271,7 @@ class MarkerWidget extends Disposable {
private readonly actionBar: ActionBar;
private readonly icon: HTMLElement;
private readonly iconContainer: HTMLElement;
private readonly messageAndDetailsContainer: HTMLElement;
private readonly disposables = this._register(new DisposableStore());
@ -283,7 +285,12 @@ class MarkerWidget extends Disposable {
this.actionBar = this._register(new ActionBar(dom.append(parent, dom.$('.actions')), {
actionViewItemProvider: (action: IAction) => action.id === QuickFixAction.ID ? _instantiationService.createInstance(QuickFixActionViewItem, <QuickFixAction>action) : undefined
}));
this.icon = dom.append(parent, dom.$(''));
// wrap the icon in a container that get the icon color as foreground color. That way, if the
// list view does not have a specific color for the icon (=the color variable is invalid) it
// falls back to the foreground color of container (inherit)
this.iconContainer = dom.append(parent, dom.$(''));
this.icon = dom.append(this.iconContainer, dom.$(''));
this.messageAndDetailsContainer = dom.append(parent, dom.$('.marker-message-details-container'));
}
@ -292,7 +299,8 @@ class MarkerWidget extends Disposable {
this.disposables.clear();
dom.clearNode(this.messageAndDetailsContainer);
this.icon.className = `marker-icon codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
this.iconContainer.className = `marker-icon ${Severity.toString(MarkerSeverity.toSeverity(element.marker.severity))}`;
this.icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
this.renderQuickfixActionbar(element);
this.renderMessageAndDetails(element, filterData);

3
src/vs/workbench/contrib/markers/browser/markersView.ts
View file

@ -478,8 +478,7 @@ export class MarkersView extends FilterViewPane implements IMarkersView {
}),
expandOnlyOnTwistieClick: (e: MarkerElement) => e instanceof Marker && e.relatedInformation.length > 0,
overrideStyles: {
listBackground: this.getBackgroundColor(),
listInactiveSelectionIconForeground: undefined // we don't want to override the severity icon color
listBackground: this.getBackgroundColor()
},
selectionNavigation: true,
multipleSelectionSupport: true,

2
test/automation/src/problems.ts
View file

@ -33,7 +33,7 @@ export class Problems {
static getSelectorInProblemsView(problemType: ProblemSeverity): string {
const selector = problemType === ProblemSeverity.WARNING ? 'codicon-warning' : 'codicon-error';
return `div[id="workbench.panel.markers"] .monaco-tl-contents .marker-icon.${selector}`;
return `div[id="workbench.panel.markers"] .monaco-tl-contents .marker-icon .${selector}`;
}
static getSelectorInEditor(problemType: ProblemSeverity): string {