From 595c7c4411eafc163be38235e1979045527460c3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Nov 2010 00:28:09 +0000 Subject: [PATCH] Fix multiple selection with Ctrl-Click in DnDVBox. git-svn-id: svn://localhost/ardour2/branches/3.0@8070 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/processor_box.h | 10 +++++----- libs/gtkmm2ext/gtkmm2ext/dndvbox.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index d5382d37b2..05fac97579 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -29,11 +29,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "gtkmm2ext/dndtreeview.h" +#include "gtkmm2ext/auto_spin.h" +#include "gtkmm2ext/click_box.h" +#include "gtkmm2ext/dndvbox.h" +#include "gtkmm2ext/pixfader.h" #include "pbd/stateful.h" #include "pbd/signals.h" diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index 486f31f084..ff3b2ef355 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -253,7 +253,9 @@ private: if (ev->button == 1 || ev->button == 3) { if (!selected (child)) { - clear_selection (); + if ((ev->state & Gdk::CONTROL_MASK) == 0) { + clear_selection (); + } if (child) { add_to_selection (child); } -- 2.30.2