Customisable scroll-wheel amount in Pango.

vasily-nesterov · Sep 11, 2011 · c4627bd · c4627bd
1 parent c4382e0
commit c4627bd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/yi/src/library/Yi/Config.hs b/yi/src/library/Yi/Config.hs
@@ -23,6 +23,7 @@ data UIConfig = UIConfig {
    configFontSize :: Maybe Int,     -- ^ Font size, for the UI that support it.
    configScrollStyle ::Maybe ScrollStyle,
    -- ^ Style of scroll
+   configScrollWheelAmount :: Int,  -- ^ Amount to move the buffer when using the scroll wheel
    configLeftSideScrollBar :: Bool, -- ^ Should the scrollbar be shown on the left side?
    configAutoHideScrollBar :: Bool, -- ^ Hide scrollbar automatically if text fits on one page.
    configAutoHideTabBar :: Bool,    -- ^ Hide the tabbar automatically if only one tab is present

diff --git a/yi/src/library/Yi/Config/Default.hs b/yi/src/library/Yi/Config/Default.hs
@@ -134,6 +134,7 @@ defaultConfig =
          , configUI         =  UIConfig 
            { configFontSize = Nothing
            , configFontName = Nothing
+           , configScrollWheelAmount = 4
            , configScrollStyle = Nothing
            , configCursorStyle = FatWhenFocusedAndInserting
            , configLineWrap = True

diff --git a/yi/src/library/Yi/Config/Simple.hs b/yi/src/library/Yi/Config/Simple.hs
@@ -30,6 +30,7 @@ module Yi.Config.Simple (
   -- * Appearance
   fontName,
   fontSize,
+  scrollWheelAmount,
   scrollStyle,
   ScrollStyle(..),
   cursorStyle,
@@ -107,8 +108,8 @@ import Yi.Config(Config, UIConfig,
                  startFrontEndA, configUIA, startActionsA, initialActionsA, defaultKmA, 
                  configInputPreprocessA, modeTableA, debugModeA,
                  configRegionStyleA, configKillringAccumulateA, bufferUpdateHandlerA,
-                 configVtyEscDelayA, configFontNameA, configFontSizeA, configScrollStyleA,
-                 configCursorStyleA, CursorStyle(..),
+                 configVtyEscDelayA, configFontNameA, configFontSizeA, configScrollWheelAmountA,
+                 configScrollStyleA, configCursorStyleA, CursorStyle(..),
                  configLeftSideScrollBarA, configAutoHideScrollBarA, configAutoHideTabBarA,
                  configLineWrapA, configWindowFillA, configThemeA, layoutManagersA, configVarsA,
                 )
@@ -244,6 +245,10 @@ fontName = configFontNameA . configUIA
 fontSize :: Field (Maybe Int)
 fontSize = configFontSizeA . configUIA
 
+-- | Amount to move the buffer when using the scroll wheel.
+scrollWheelAmount :: Field Int
+scrollWheelAmount = configScrollWheelAmountA . configUIA
+
 -- | 'Just' the scroll style, or 'Nothing' for default.
 scrollStyle :: Field (Maybe ScrollStyle)
 scrollStyle = configScrollStyleA . configUIA

diff --git a/yi/src/library/Yi/UI/Pango.hs b/yi/src/library/Yi/UI/Pango.hs
@@ -700,9 +700,10 @@ handleScroll ui w = do
     -- query new coordinates
     let editorAction = do
           withBuffer0 $ scrollB $ case scrollDirection of
-            ScrollUp   -> -1
-            ScrollDown -> 1
+            ScrollUp   -> negate configAmount
+            ScrollDown -> configAmount
             _          -> 0 -- Left/right scrolling not supported
+        configAmount = configScrollWheelAmount $ uiConfig ui
     uiActionCh ui (makeAction editorAction)
     if ifPressed
      then selectArea ui w xy