Fix for SMPTE clock text entry

[ardour.git] / gtk2_ardour / editor_edit_groups.cc

diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index cda8f1c4be011da8d279181da9e8024baa4d9b8e..2ee1773646b78327812f95a0f0c4c900fa6a57a9 100644 (file)
--- a/gtk2_ardour/editor_edit_groups.cc
+++ b/gtk2_ardour/editor_edit_groups.cc
@@ -38,6 +38,7 @@
 
 using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 
 void
@@ -118,7 +119,7 @@ Editor::edit_group_list_button_press_event (GdkEventButton* ev)
                if (edit_group_list_menu == 0) {
                        build_edit_group_list_menu ();
                }
-               edit_group_list_menu->popup (1, 0);
+               edit_group_list_menu->popup (1, ev->time);
                return true;
        }
 
@@ -149,20 +150,20 @@ Editor::edit_group_list_button_press_event (GdkEventButton* ev)
 
        case 1:
                if ((iter = group_model->get_iter (path))) {
-                       bool visible = (*iter)[group_columns.is_visible];
-                       (*iter)[group_columns.is_visible] = !visible;
+                       bool active = (*iter)[group_columns.is_active];
+                       (*iter)[group_columns.is_active] = !active;
                        return true;
                }
                break;
-
+               
        case 2:
                if ((iter = group_model->get_iter (path))) {
-                       bool active = (*iter)[group_columns.is_active];
-                       (*iter)[group_columns.is_active] = !active;
+                       bool visible = (*iter)[group_columns.is_visible];
+                       (*iter)[group_columns.is_visible] = !visible;
                        return true;
                }
                break;
-               
+
        default:
                break;
        }
@@ -218,7 +219,10 @@ Editor::add_edit_group (RouteGroup* group)
        row[group_columns.is_active] = group->is_active();
        row[group_columns.is_visible] = !group->is_hidden();
 
+       in_edit_group_row_change = true;
+
        row[group_columns.routegroup] = group;
+
        if (!group->name().empty()) {
                row[group_columns.text] = group->name();
        } else {
@@ -229,9 +233,12 @@ 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);
        }
+
+       in_edit_group_row_change = false;
 }
 
 void
@@ -241,7 +248,6 @@ Editor::edit_groups_changed ()
 
        /* just rebuild the while thing */
 
-       edit_group_display.set_model (Glib::RefPtr<TreeModel>(0));
        group_model->clear ();
 
        {
@@ -254,7 +260,6 @@ Editor::edit_groups_changed ()
        }
 
        session->foreach_edit_group (mem_fun (*this, &Editor::add_edit_group));
-       edit_group_display.set_model (group_model);
 }
 
 void