Make Dropdown menus at least as wide as the button

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index aa12e4fea858ee60254a8702d1d88c52bc850c85..f7eb676d9693adeeca9c1388c6da76d51d30675f 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -26,6 +26,8 @@
 #include "ardour/playlist.h"
 #include "ardour/rc_configuration.h"
 
+#include "control_protocol/control_protocol.h"
+
 #include "audio_region_view.h"
 #include "debug.h"
 #include "gui_thread.h"
@@ -39,7 +41,7 @@
 #include "public_editor.h"
 #include "control_point.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -620,10 +622,14 @@ Selection::add (boost::shared_ptr<Evoral::ControlList> cl)
                warning << "Programming error: Selected list is not an ARDOUR::AutomationList" << endmsg;
                return;
        }
-       if (find (lines.begin(), lines.end(), al) == lines.end()) {
-               lines.push_back (al);
-               LinesChanged();
-       }
+
+       /* The original may change so we must store a copy (not a pointer) here.
+        * e.g AutomationLine rewrites the list with gain mapping.
+        * the downside is that we can't perfom duplicate checks.
+        * This code was changed in response to #6842
+        */
+       lines.push_back (boost::shared_ptr<ARDOUR::AutomationList> (new ARDOUR::AutomationList(*al)));
+       LinesChanged();
 }
 
 void
@@ -633,6 +639,7 @@ Selection::remove (TimeAxisView* track)
        if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) {
                track->set_selected (false);
                tracks.erase (i);
+
                if (!_no_tracks_changed) {
                        TracksChanged();
                }
@@ -947,7 +954,7 @@ Selection::selected (ArdourMarker* m)
 bool
 Selection::selected (TimeAxisView* tv)
 {
-       return tv->get_selected ();
+       return tv->selected ();
 }
 
 bool
@@ -993,7 +1000,7 @@ Selection::toggle (ControlPoint* cp)
        clear_time();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
 
-       cp->set_selected (!cp->get_selected ());
+       cp->set_selected (!cp->selected ());
        PointSelection::iterator i = find (points.begin(), points.end(), cp);
        if (i == points.end()) {
                points.push_back (cp);
@@ -1143,7 +1150,7 @@ Selection::set (ControlPoint* cp)
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
 
-       if (cp->get_selected () && points.size () == 1) {
+       if (cp->selected () && points.size () == 1) {
                return;
        }
 
@@ -1361,7 +1368,7 @@ Selection::set_state (XMLNode const & node, int)
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->name() == X_("RouteView")) {
 
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
                        assert (prop_id);
                        PBD::ID id (prop_id->value ());
                        RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
@@ -1370,7 +1377,7 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if ((*i)->name() == X_("Region")) {
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
                        assert (prop_id);
                        PBD::ID id (prop_id->value ());
 
@@ -1388,7 +1395,7 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if ((*i)->name() == X_("MIDINote")) {
-                       XMLProperty* prop_region_id = (*i)->property (X_("region-id"));
+                       XMLProperty const * prop_region_id = (*i)->property (X_("region-id"));
 
                        assert (prop_region_id);
 
@@ -1401,12 +1408,12 @@ Selection::set_state (XMLNode const & node, int)
                        XMLNodeList children = (*i)->children ();
 
                        for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) {
-                               XMLProperty* prop_channel = (*ci)->property (X_("channel"));
-                               XMLProperty* prop_time = (*ci)->property (X_("time"));
-                               XMLProperty* prop_note = (*ci)->property (X_("note"));
-                               XMLProperty* prop_length = (*ci)->property (X_("length"));
-                               XMLProperty* prop_velocity = (*ci)->property (X_("velocity"));
-                               XMLProperty* prop_off_velocity = (*ci)->property (X_("off-velocity"));
+                               XMLProperty const * prop_channel = (*ci)->property (X_("channel"));
+                               XMLProperty const * prop_time = (*ci)->property (X_("time"));
+                               XMLProperty const * prop_note = (*ci)->property (X_("note"));
+                               XMLProperty const * prop_length = (*ci)->property (X_("length"));
+                               XMLProperty const * prop_velocity = (*ci)->property (X_("velocity"));
+                               XMLProperty const * prop_off_velocity = (*ci)->property (X_("off-velocity"));
 
                                assert (prop_channel);
                                assert (prop_time);
@@ -1441,16 +1448,16 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if  ((*i)->name() == X_("ControlPoint")) {
-                       XMLProperty* prop_type = (*i)->property (X_("type"));
+                       XMLProperty const * prop_type = (*i)->property (X_("type"));
 
                        assert(prop_type);
 
                        if (prop_type->value () == "track") {
 
-                               XMLProperty* prop_route_id = (*i)->property (X_("route-id"));
-                               XMLProperty* prop_alist_id = (*i)->property (X_("automation-list-id"));
-                               XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
-                               XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
+                               XMLProperty const * prop_route_id = (*i)->property (X_("route-id"));
+                               XMLProperty const * prop_alist_id = (*i)->property (X_("automation-list-id"));
+                               XMLProperty const * prop_parameter = (*i)->property (X_("parameter"));
+                               XMLProperty const * prop_view_index = (*i)->property (X_("view-index"));
 
                                assert (prop_route_id);
                                assert (prop_alist_id);
@@ -1480,8 +1487,8 @@ Selection::set_state (XMLNode const & node, int)
                                        add (cps);
                                }
                        } else if (prop_type->value () == "region") {
-                               XMLProperty* prop_region_id = (*i)->property (X_("region-id"));
-                               XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
+                               XMLProperty const * prop_region_id = (*i)->property (X_("region-id"));
+                               XMLProperty const * prop_view_index = (*i)->property (X_("view-index"));
 
                                if (!prop_region_id || !prop_view_index) {
                                        continue;
@@ -1511,8 +1518,8 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if  ((*i)->name() == X_("AudioRange")) {
-                       XMLProperty* prop_start = (*i)->property (X_("start"));
-                       XMLProperty* prop_end = (*i)->property (X_("end"));
+                       XMLProperty const * prop_start = (*i)->property (X_("start"));
+                       XMLProperty const * prop_end = (*i)->property (X_("end"));
 
                        assert (prop_start);
                        assert (prop_end);
@@ -1524,8 +1531,8 @@ Selection::set_state (XMLNode const & node, int)
 
                } else if ((*i)->name() == X_("AutomationView")) {
 
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
-                       XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_parameter = (*i)->property (X_("parameter"));
 
                        assert (prop_id);
                        assert (prop_parameter);
@@ -1548,8 +1555,8 @@ Selection::set_state (XMLNode const & node, int)
 
                } else if ((*i)->name() == X_("Marker")) {
 
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
-                       XMLProperty* prop_start = (*i)->property (X_("start"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_start = (*i)->property (X_("start"));
                        assert (prop_id);
                        assert (prop_start);