Use Alt to avoid collision with font zooming & other small tweaks

alexdima · alexdima · commit 699101e3abc1 · 2018-12-19T16:32:23.000+01:00
diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts
@@ -188,4 +188,4 @@ export class StandardWheelEvent {
 			}
 		}
 	}
-}
+}
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -341,12 +341,10 @@ export abstract class AbstractScrollableElement extends Widget {
 				deltaY = 0;
 			}
 
-			if (e.browserEvent.shiftKey !== null) {
-				//fastScrolling
-				if (e.browserEvent.shiftKey) {
-					deltaX = deltaX * this._options.fastScrollSensitivity;
-					deltaY = deltaY * this._options.fastScrollSensitivity;
-				}
+			if (e.browserEvent && e.browserEvent.altKey) {
+				// fastScrolling
+				deltaX = deltaX * this._options.fastScrollSensitivity;
+				deltaY = deltaY * this._options.fastScrollSensitivity;
 			}
 
 			const futureScrollPosition = this._scrollable.getFutureScrollPosition();
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts b/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts
@@ -51,8 +51,8 @@ export interface ScrollableElementCreationOptions {
 	 */
 	mouseWheelScrollSensitivity?: number;
 	/**
-	 * FastScrolling mulitplier speed when pressing `Shift`
-	 * Defaults to 10.
+	 * FastScrolling mulitplier speed when pressing `Alt`
+	 * Defaults to 5.
 	 */
 	fastScrollSensitivity?: number;
 	/**
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -431,14 +431,8 @@ const editorConfiguration: IConfigurationNode = {
 		},
 		'editor.fastScrollSensitivity': {
 			'type': 'number',
-			'enum': [1, 5, 10],
-			enumDescriptions: [
-				nls.localize('fastScrollSensitivity.1', "Fast Scrolling Off"),
-				nls.localize('fastScrollSensitivity.5', "Default Speed"),
-				nls.localize('fastScrollSensitivity.10', "Fast Speed"),
-			],
 			'default': EDITOR_DEFAULTS.viewInfo.scrollbar.fastScrollSensitivity,
-			'markdownDescription': nls.localize('fastScrollSensitivity', "Scrolling speed mulitiplier when pressing `Shift`")
+			'markdownDescription': nls.localize('fastScrollSensitivity', "Scrolling speed mulitiplier when pressing `Alt`")
 		},
 		'editor.multiCursorModifier': {
 			'type': 'string',
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
@@ -459,8 +459,8 @@ export interface IEditorOptions {
 	 */
 	mouseWheelScrollSensitivity?: number;
 	/**
-	 * FastScrolling mulitplier speed when pressing `Shift`
-	 * Defaults to 10.
+	 * FastScrolling mulitplier speed when pressing `Alt`
+	 * Defaults to 5.
 	 */
 	fastScrollSensitivity?: number;
 	/**
@@ -1976,7 +1976,7 @@ export class EditorOptionsValidator {
 
 		let fastScrollSensitivity = _float(opts.fastScrollSensitivity, defaults.scrollbar.fastScrollSensitivity);
 		if (fastScrollSensitivity <= 0) {
-			fastScrollSensitivity = 5;
+			fastScrollSensitivity = defaults.scrollbar.fastScrollSensitivity;
 		}
 		const scrollbar = this._sanitizeScrollbarOpts(opts.scrollbar, defaults.scrollbar, mouseWheelScrollSensitivity, fastScrollSensitivity);
 		const minimap = this._sanitizeMinimapOpts(opts.minimap, defaults.minimap);
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -2788,8 +2788,8 @@ declare namespace monaco.editor {
 		 */
 		mouseWheelScrollSensitivity?: number;
 		/**
-		 * FastScrolling mulitplier speed when pressing `Shift`
-		 * Defaults to 10.
+		 * FastScrolling mulitplier speed when pressing `Alt`
+		 * Defaults to 5.
 		 */
 		fastScrollSensitivity?: number;
 		/**

Original file line number	Diff line number	Diff line change
`@@ -188,4 +188,4 @@ export class StandardWheelEvent {`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`}`
`191`		`-}`
	`191`	`+}`