X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_edit_groups.cc;h=a0e7372ded3b91d889490b93bd9f19e2bf0e3bf9;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=56a3b6c4c489598339ee1025eb2f00159808a8f9;hpb=e72e0caf9949be20b3d5416648a902ab3fe9c588;p=ardour.git

diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index 56a3b6c4c4..a0e7372ded 100644
--- a/gtk2_ardour/editor_edit_groups.cc
+++ b/gtk2_ardour/editor_edit_groups.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -23,7 +22,7 @@
 
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <ardour/route_group.h>
+#include "ardour/route_group.h"
 
 #include "editor.h"
 #include "keyboard.h"
@@ -32,12 +31,14 @@
 #include "prompter.h"
 #include "gui_thread.h"
 
-#include <ardour/route.h>
+#include "ardour/route.h"
 
 #include "i18n.h"
 
+using namespace std;
 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;
 	}
 
@@ -140,6 +141,9 @@ Editor::edit_group_list_button_press_event (GdkEventButton* ev)
 			if ((iter = group_model->get_iter (path))) {
 				if ((group = (*iter)[group_columns.routegroup]) != 0) {
 					// edit_route_group (group);
+#ifdef GTKOSX
+					edit_group_display.queue_draw();
+#endif
 					return true;
 				}
 			}
@@ -149,20 +153,26 @@ 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;
+#ifdef GTKOSX
+			edit_group_display.queue_draw();
+#endif
 			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;
+#ifdef GTKOSX
+			edit_group_display.queue_draw();
+#endif
 			return true;
 		}
 		break;
-		
+
 	default:
 		break;
 	}
@@ -218,7 +228,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 {
@@ -233,6 +246,8 @@ Editor::add_edit_group (RouteGroup* group)
 		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