upgpkg: code-transparent 1.40.1-1

upstream release

1 files changed, 53 insertions, 51 deletions

diff --git a/transparent.diff b/transparent.diff
index 3b4a9b08306f..ea276d46a910 100644
--- a/transparent.diff
+++ b/transparent.diff
@@ -1,10 +1,10 @@
-
-diff -ru a/src/main.js b/src/main.js
---- a/src/main.js	2019-10-21 15:16:40.287933959 +0800
-+++ b/src/main.js	2019-10-21 14:24:16.491539975 +0800
-@@ -142,6 +142,9 @@
- 	// Force pre-Chrome-60 color profile handling (for https://github.com/Microsoft/vscode/issues/51791)
- 	app.commandLine.appendSwitch('disable-color-correct-rendering');
+diff --git a/src/main.js b/src/main.js
+index d5f4c90..5e4dba7 100644
+--- a/src/main.js
++++ b/src/main.js
+@@ -157,6 +157,9 @@ function configureCommandlineSwitchesSync(cliArgs) {
+ 		}
+ 	});
  
 +	// enable transparent
 +	app.commandLine.appendSwitch('enable-transparent-visuals');
@@ -12,32 +12,33 @@ diff -ru a/src/main.js b/src/main.js
  	// Support JS Flags
  	const jsFlags = getJSFlags(cliArgs);
  	if (jsFlags) {
-diff -ru a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
---- a/src/vs/code/electron-main/window.ts	2019-10-21 15:16:40.304601230 +0800
-+++ b/src/vs/code/electron-main/window.ts	2019-10-21 15:14:08.935088758 +0800
-@@ -121,7 +121,8 @@
- 			height: this.windowState.height,
- 			x: this.windowState.x,
- 			y: this.windowState.y,
--			backgroundColor: this.themeMainService.getBackgroundColor(),
-+			transparent: true,
-+			backgroundColor: '#00000000' || this.themeMainService.getBackgroundColor(),
- 			minWidth: CodeWindow.MIN_WIDTH,
- 			minHeight: CodeWindow.MIN_HEIGHT,
- 			show: !isFullscreenOrMaximized,
-diff -ru a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
---- a/src/vs/workbench/common/theme.ts	2019-10-21 23:14:46.424664135 +0800
-+++ b/src/vs/workbench/common/theme.ts	2019-10-21 23:15:24.641792763 +0800
-@@ -7,20 +7,25 @@
- import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, editorWidgetForeground } from 'vs/platform/theme/common/colorRegistry';
+diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
+index b55f409..8c61319 100644
+--- a/src/vs/code/electron-main/window.ts
++++ b/src/vs/code/electron-main/window.ts
+@@ -122,7 +122,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
+ 				height: this.windowState.height,
+ 				x: this.windowState.x,
+ 				y: this.windowState.y,
+-				backgroundColor: this.themeMainService.getBackgroundColor(),
++				transparent: true,
++				backgroundColor: '#00000000' || this.themeMainService.getBackgroundColor(),
+ 				minWidth: CodeWindow.MIN_WIDTH,
+ 				minHeight: CodeWindow.MIN_HEIGHT,
+ 				show: !isFullscreenOrMaximized,
+diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
+index 188874a..5769904 100644
+--- a/src/vs/workbench/common/theme.ts
++++ b/src/vs/workbench/common/theme.ts
+@@ -7,20 +7,24 @@ import * as nls from 'vs/nls';
+ import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, editorWidgetForeground, editorErrorForeground, editorWarningForeground, editorInfoForeground } from 'vs/platform/theme/common/colorRegistry';
  import { Disposable } from 'vs/base/common/lifecycle';
  import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 -import { Color } from 'vs/base/common/color';
 +import { Color, RGBA } from 'vs/base/common/color';
-
--// < --- Workbench (not customizable) --- >
-+// < --- Workbench --- >
-
+ 
+ // < --- Workbench (not customizable) --- >
+ 
 -export function WORKBENCH_BACKGROUND(theme: ITheme): Color {
 -	switch (theme.type) {
 -		case 'dark':
@@ -48,31 +49,32 @@ diff -ru a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
 -			return Color.fromHex('#000000');
 -	}
 -}
-+export const WORKBENCH_BACKGROUND = (theme: ITheme) =>
-+	theme.getColor(
-+		registerColor(
-+			'workbench.background',
-+			{
-+				dark: '#252526',
-+				light: '#F3F3F3',
-+				hc: '#000000'
-+			},
-+			nls.localize(
-+				'workbenchBackground',
-+				'Top-level background color. Not seen unless other elements have a transparent color.'
-+			)
++export const WORKBENCH_BACKGROUND = (theme: ITheme) => theme.getColor(
++	registerColor(
++		'workbench.background',
++		{
++			dark: '#252526',
++			light: '#F3F3F3',
++			hc: '#000000'
++		},
++		nls.localize(
++			'workbenchBackground',
++			'Top-level background color. Not seen unless other elements have a transparent color.'
 +		)
-+	) || new Color(new RGBA(0, 0, 0, 0));
-
++	)
++) || new Color(new RGBA(0, 0, 0, 0));
+ 
  // < --- Tabs --- >
-
---- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts	2019-10-22 10:40:29.212561275 +0800
-+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts	2019-10-22 10:41:08.469016308 +0800
-@@ -469,6 +469,7 @@
+ 
+diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+index 373f411..16d74ca 100644
+--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
++++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+@@ -466,6 +466,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
  			macOptionIsMeta: config.macOptionIsMeta,
  			macOptionClickForcesSelection: config.macOptionClickForcesSelection,
  			rightClickSelectsWord: config.rightClickBehavior === 'selectWord',
 +			allowTransparency: true,
- 			// TODO: Guess whether to use canvas or dom better
- 			rendererType: config.rendererType === 'auto' ? 'canvas' : config.rendererType
- 		});
+ 			fastScrollModifier: 'alt',
+ 			fastScrollSensitivity: editorOptions.fastScrollSensitivity,
+ 			scrollSensitivity: editorOptions.mouseWheelScrollSensitivity,