diff options
| -rw-r--r-- | gtk2_ardour/editor_edit_groups.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 11 | ||||
| -rw-r--r-- | gtk2_ardour/utils.cc | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc index cda8f1c4be..e15da94f0c 100644 --- a/gtk2_ardour/editor_edit_groups.cc +++ b/gtk2_ardour/editor_edit_groups.cc @@ -229,8 +229,9 @@ Editor::add_edit_group (RouteGroup* group) group->FlagsChanged.connect (bind (mem_fun(*this, &Editor::group_flags_changed), group)); if (focus) { - edit_group_display.set_cursor (group_model->get_path (row)); - edit_group_display.grab_focus (); + TreeViewColumn* col = edit_group_display.get_column (0); + CellRendererText* name_cell = dynamic_cast<CellRendererText*>(edit_group_display.get_column_cell_renderer (0)); + edit_group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true); } } diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 685b96d1fd..0d8b0f243c 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -163,11 +163,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) mix_group_display_button_box->pack_start (*mix_group_remove_button, false, false); group_display_vbox.pack_start (group_display_scroller, true, true); - - HBox* hconstraint = manage (new HBox()); - hconstraint->pack_start (*mix_group_display_button_box, false, false); - - group_display_vbox.pack_start (*hconstraint, false, false); + group_display_vbox.pack_start (*mix_group_display_button_box, false, false); track_display_frame.set_name("BaseFrame"); track_display_frame.set_shadow_type (Gtk::SHADOW_IN); @@ -1001,8 +997,9 @@ Mixer_UI::add_mix_group (RouteGroup* group) group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group)); if (focus) { - group_display.set_cursor (group_model->get_path (row)); - group_display.grab_focus (); + TreeViewColumn* col = group_display.get_column (0); + CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0)); + group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true); } } diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index efb15a4d52..19c280f646 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -544,6 +544,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) */ if (ev->state & ~Gdk::SHIFT_MASK) { + /* modifiers in effect, accelerate first */ if (!gtk_window_activate_key (win, ev)) { return gtk_window_propagate_key_event (win, ev); |