diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2012-06-27 12:21:23 +0000 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2012-06-27 12:21:23 +0000 |
| commit | 5ba1996fd70f05362c70b54e68261b955659f291 (patch) | |
| tree | 9e30d384f33df9f3eff2d84175752cd9d2390da5 /gtk2_ardour/mixer_ui.cc | |
| parent | 266030b79c19c144cc093d69ee57117f742f8347 (diff) | |
A (hopefully) better fix for toggle-mixer-on-top, using gtk_window_is_active() to work out whether the mixer is already on top.
git-svn-id: svn://localhost/ardour2/branches/3.0@12952 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index a29717211e..5034243680 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1565,25 +1565,13 @@ Mixer_UI::on_key_press_event (GdkEventKey* ev) if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { return true; } - + KeyboardKey k (ev->state, ev->keyval); - GtkAccelKey key; - - /* Handle toggle-mixer-on-top here, so it can do a different thing if the - mixer is already on top and received this key press. - */ - if (gtk_accel_map_lookup_entry("<Actions>/Common/toggle-mixer-on-top", &key)) { - if (int (k.state()) == key.accel_mods && k.key() == key.accel_key) { - ARDOUR_UI::instance()->goto_editor_window(); - return true; - } - } - if (bindings.activate (k, Bindings::Press)) { return true; } - + return forward_key_press (ev); } |