Fix for fine adjust overriding snap modifiers.
authornick_m <mainsbridge@gmail.com>
Sat, 3 Oct 2015 18:05:56 +0000 (05:05 +1100)
committernick_m <mainsbridge@gmail.com>
Mon, 19 Oct 2015 13:53:29 +0000 (00:53 +1100)
gtk2_ardour/editor_drag.cc

index d3e40adf122d5594a0c86e65b5056bd65650768f..2574ba803ee8dd47ea0b9edbef7474efeea5f5b2 100644 (file)
@@ -4113,7 +4113,7 @@ ControlPointDrag::motion (GdkEvent* event, bool first_motion)
        double dx = _drags->current_pointer_x() - last_pointer_x();
        double dy = current_pointer_y() - last_pointer_y();
 
-       if (event->button.state & ArdourKeyboard::fine_adjust_modifier ()) {
+       if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::fine_adjust_modifier ())) {
                dx *= 0.1;
                dy *= 0.1;
        }
@@ -4253,7 +4253,7 @@ LineDrag::motion (GdkEvent* event, bool first_move)
 {
        double dy = current_pointer_y() - last_pointer_y();
 
-       if (event->button.state & ArdourKeyboard::fine_adjust_modifier ()) {
+       if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::fine_adjust_modifier ())) {
                dy *= 0.1;
        }