allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix special handling of 'zoom vertical' scroll wheel modifier key.

Browse Source 
gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of
the modifier key used to adjust track heights in conjunction with the
scroll wheel, so that the same track continues to be resized even when
it's shrunk to no longer be under the mouse cursor. However, this code
assumed that the modifier key for this was <Shift>.

Fix it to use the event->state bit corresponding to
ScrollZoomVerticalModifier instead, and rename the relevant functions to
clarify that it's the 'zoom vertical' modifier key they're dealing with.

Partially fixes #5610.
This commit is contained in:
Colin Fletcher
2013-07-23 16:15:23 +01:00
committed by Paul Davis
parent c222acecaa
commit 1da655c2eb
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gtkmm2ext/gtkmm2ext/keyboard.h
View File

@@ -164,7 +164,7 @@ class Keyboard : public sigc::trackable, PBD::Stateful
}
};
sigc::signal0<void> ShiftReleased;
sigc::signal0<void> ZoomVerticalModifierReleased;
protected:
static Keyboard* _the_keyboard;

11
libs/gtkmm2ext/keyboard.cc
View File

@@ -248,12 +248,15 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
keyval = event->keyval;
}
if (keyval == GDK_Shift_L) {
if (event->state & ScrollZoomVerticalModifier) {
/* There is a special and rather hacky situation in Editor which makes
it useful to know when a shift key has been released, so emit a signal
here (see Editor::_stepping_axis_view)
it useful to know when the modifier key for vertical zoom has been
released, so emit a signal here (see Editor::_stepping_axis_view).
Note that the state bit for the modifier key is set for the key-up
event when the modifier is released, but not the key-down when it
is pressed, so we get here on key-up, which is what we want.
*/
ShiftReleased (); /* EMIT SIGNAL */
ZoomVerticalModifierReleased (); /* EMIT SIGNAL */
}
if (event->type == GDK_KEY_PRESS) {