]> git.0d.be Git - jack_mixer.git/commitdiff
Fix step_increment for scroll event
authorDaniel Sheeler <dsheeler@pobox.com>
Fri, 12 Jun 2020 06:13:50 +0000 (01:13 -0500)
committerDaniel Sheeler <dsheeler@pobox.com>
Fri, 12 Jun 2020 06:13:50 +0000 (01:13 -0500)
channel.py
slider.py

index 3133a7de697abd24286ce538a130f0fb9c0e082f..ece791e8ce30e497699e07739ed7bf3561fb1108 100644 (file)
@@ -56,7 +56,7 @@ class Channel(Gtk.VBox, SerializedObject):
         self.stereo = stereo
         self.meter_scale = self.gui_factory.get_default_meter_scale()
         self.slider_scale = self.gui_factory.get_default_slider_scale()
-        self.slider_adjustment = slider.AdjustmentdBFS(self.slider_scale, 0.0)
+        self.slider_adjustment = slider.AdjustmentdBFS(self.slider_scale, 0.0, 0.02)
         self.balance_adjustment = Gtk.Adjustment(0.0, -1.0, 1.0, 0.02)
         self.future_out_mute = None
         self.future_volume_midi_cc = None
index 0c0a64ce03cacdf5c76616552a39a702febaeb16..836cfcd16c424046ae7519fc4163dbcf06a709e6 100644 (file)
--- a/slider.py
+++ b/slider.py
@@ -21,10 +21,11 @@ from gi.repository import GObject
 import cairo
 
 class AdjustmentdBFS(Gtk.Adjustment):
-    def __init__(self, scale, default_db):
+    def __init__(self, scale, default_db, step_inc):
         self.default_value = scale.db_to_scale(default_db)
         self.db = default_db
         self.scale = scale
+        self.step_increment = step_inc
         Gtk.Adjustment.__init__(self, self.default_value, 0.0, 1.0, 0.02)
         self.connect("value-changed", self.on_value_changed)
         self.disable_value_notify = False
@@ -103,7 +104,7 @@ class CustomSliderWidget(Gtk.DrawingArea):
                 Gdk.EventMask.SCROLL_MASK | Gdk.EventMask.BUTTON_PRESS_MASK)
 
     def on_scroll(self, widget, event):
-        delta = 0.05
+        delta = self.adjustment.step_increment 
         value = self.adjustment.get_value()
         if event.direction == Gdk.ScrollDirection.UP:
             y = value + delta