fix(frontend/presenter): constrain zoom hotkeys to option range

shabados · Oct 23, 2020 · a2b2431 · a2b2431
1 parent 0e104dc
commit a2b2431
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/frontend/src/Presenter/index.js b/app/frontend/src/Presenter/index.js
@@ -30,6 +30,7 @@ import {
 import { GLOBAL_SHORTCUTS } from '../lib/keyMap'
 import { SettingsContext } from '../lib/contexts'
 import { useCurrentLines } from '../lib/hooks'
+import { OPTIONS } from '../lib/options'
 
 import ThemeLoader from '../shared/ThemeLoader'
 import Loader from '../shared/Loader'
@@ -110,9 +111,10 @@ const Presenter = () => {
     search: queryString.stringify( { [ STATES.controllerOnly ]: true } ),
   } )
 
+  const { controllerZoom } = OPTIONS
   const setZoom = controllerZoom => controller.setSettings( { layout: { controllerZoom } } )
-  const zoomInController = () => setZoom( zoom + 0.1 )
-  const zoomOutController = () => setZoom( zoom - 0.1 )
+  const zoomInController = () => setZoom( Math.min( controllerZoom.max, zoom + 0.1 ) )
+  const zoomOutController = () => setZoom( Math.max( controllerZoom.min, zoom - 0.1 ) )
   const zoomResetController = () => setZoom( 1 )
 
   /**

diff --git a/app/frontend/src/lib/keyMap.js b/app/frontend/src/lib/keyMap.js
@@ -44,7 +44,7 @@ export const GLOBAL_SHORTCUTS = decorateGroup( {
   },
   zoomInController: {
     name: 'Zoom Controller In',
-    sequences: [ 'ctrl++' ],
+    sequences: [ 'ctrl++', 'ctrl+shift+=' ],
     required: true,
   },
   zoomOutController: {