Skip to content

Commit f7bd7ff

Browse files
jriekenjrieken
committed
undo some changes
1 parent 066dfef commit f7bd7ff

7 files changed

Lines changed: 18 additions & 24 deletions

File tree

‎src/vs/editor/contrib/gotoError/gotoErrorWidget.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export class MarkerNavigationWidget extends ZoneWidget {
188188
}
189189

190190
private _applyTheme(theme: ITheme) {
191-
this._backgroundColor = theme.getColor(editorMarkerNavigationBackground) || undefined;
191+
this._backgroundColor = theme.getColor(editorMarkerNavigationBackground);
192192
let colorId = editorMarkerNavigationError;
193193
if (this._severity === MarkerSeverity.Warning) {
194194
colorId = editorMarkerNavigationWarning;

‎src/vs/editor/contrib/referenceSearch/referencesWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ export class ReferenceWidget extends PeekViewWidget {
279279
arrowColor: borderColor,
280280
frameColor: borderColor,
281281
headerBackgroundColor: theme.getColor(peekViewTitleBackground) || Color.transparent,
282-
primaryHeadingColor: theme.getColor(peekViewTitleForeground) || undefined,
283-
secondaryHeadingColor: theme.getColor(peekViewTitleInfoForeground) || undefined
282+
primaryHeadingColor: theme.getColor(peekViewTitleForeground),
283+
secondaryHeadingColor: theme.getColor(peekViewTitleInfoForeground)
284284
});
285285
}
286286

‎src/vs/workbench/api/electron-browser/mainThreadWebview.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2222
import { onUnexpectedError } from 'vs/base/common/errors';
2323
import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
2424

25-
25+
// todo@joh not nice!
2626
export let mainThreadWebviews: MainThreadWebviews;
2727

2828
@extHostNamedCustomer(MainContext.MainThreadWebviews)

‎src/vs/workbench/browser/parts/quickinput/quickInputBox.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,18 @@ export class QuickInputBox {
100100

101101
style(theme: ITheme) {
102102
this.inputBox.style({
103-
inputForeground: theme.getColor(inputForeground) || undefined,
104-
inputBackground: theme.getColor(inputBackground) || undefined,
105-
inputBorder: theme.getColor(inputBorder) || undefined,
106-
inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground) || undefined,
107-
inputValidationInfoForeground: theme.getColor(inputValidationInfoForeground) || undefined,
108-
inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder) || undefined,
109-
inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground) || undefined,
110-
inputValidationWarningForeground: theme.getColor(inputValidationWarningForeground) || undefined,
111-
inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder) || undefined,
112-
inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground) || undefined,
113-
inputValidationErrorForeground: theme.getColor(inputValidationErrorForeground) || undefined,
114-
inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder) || undefined,
103+
inputForeground: theme.getColor(inputForeground),
104+
inputBackground: theme.getColor(inputBackground),
105+
inputBorder: theme.getColor(inputBorder),
106+
inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
107+
inputValidationInfoForeground: theme.getColor(inputValidationInfoForeground),
108+
inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
109+
inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
110+
inputValidationWarningForeground: theme.getColor(inputValidationWarningForeground),
111+
inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
112+
inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
113+
inputValidationErrorForeground: theme.getColor(inputValidationErrorForeground),
114+
inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder),
115115
});
116116
}
117117

‎src/vs/workbench/contrib/files/electron-browser/views/explorerView.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,6 @@ export class ExplorerView extends ViewletPanel {
344344

345345
if (e.browserEvent instanceof MouseEvent) {
346346
isDoubleClick = e.browserEvent.detail === 2;
347-
348-
if (!this.tree.openOnSingleClick && !isDoubleClick) {
349-
return;
350-
}
351-
352347
isMiddleClick = e.browserEvent.button === 1;
353348
const isLeftButton = e.browserEvent.button === 0;
354349

‎src/vs/workbench/contrib/scm/electron-browser/dirtydiffDecorator.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ class DirtyDiffWidget extends PeekViewWidget {
365365
arrowColor: borderColor,
366366
frameColor: borderColor,
367367
headerBackgroundColor: theme.getColor(peekViewTitleBackground) || Color.transparent,
368-
primaryHeadingColor: theme.getColor(peekViewTitleForeground) || undefined,
369-
secondaryHeadingColor: theme.getColor(peekViewTitleInfoForeground) || undefined
368+
primaryHeadingColor: theme.getColor(peekViewTitleForeground),
369+
secondaryHeadingColor: theme.getColor(peekViewTitleInfoForeground)
370370
});
371371
}
372372

‎src/vs/workbench/workbench.main.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ import 'vs/workbench/contrib/experiments/electron-browser/experiments.contributi
178178
// Code Insets
179179
import 'vs/workbench/parts/codeinset/codeInset.contribution';
180180

181-
//#endregion
182181
// Issues
183182
import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';
184183

0 commit comments

Comments
 (0)