start editing new edit/mix group names immediately after they are added

git-svn-id: svn://localhost/trunk/ardour2@372 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index cda8f1c4be011da8d279181da9e8024baa4d9b8e..e15da94f0ccbc13a2a04ecaff72c8b60bcac6006 100644 (file)
--- 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 685b96d1fd9f69d36bf9609a2a1d4d2cf480241e..0d8b0f243c319df42efc45f55eaae408c36e6e66 100644 (file)
--- 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 efb15a4d527760cd83350bf2c66c1fd5be0a316e..19c280f6460be100cd75eaa88782d4d0694e30b1 100644 (file)
--- 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);