diff options
author | Robin Gareus <robin@gareus.org> | 2017-03-10 23:51:39 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-03-11 00:33:43 +0100 |
commit | 05dfc1fdc1e0c0e41dadfacbfb5c1076f8a7364a (patch) | |
tree | 7a2264db527fb700a4cf0a80fc24931f73917023 /gtk2_ardour/route_ui.h | |
parent | 7a709f23f13c7485200cbd67dd3adb4e1a268359 (diff) |
Update color stripable color-picker(s)
* consistent behavior (Route, VCA)
* non-modal
* a single color picker for each RouteUI/VCA at most
* fix bug: VCA picker staying around even when VCA was deleted
Diffstat (limited to 'gtk2_ardour/route_ui.h')
-rw-r--r-- | gtk2_ardour/route_ui.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 6f53b7232d..7e4dd2e968 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -26,6 +26,7 @@ #include "pbd/signals.h" #include <gtkmm/textview.h> +#include <gtkmm/colorselection.h> #include "gtkmm2ext/widget_state.h" @@ -40,6 +41,7 @@ #include "axis_view.h" #include "selectable.h" +#include "stripable_colorpicker.h" #include "window_manager.h" namespace ARDOUR { @@ -336,6 +338,8 @@ private: std::vector<ArdourButton*> _invert_buttons; Gtk::Menu* _invert_menu; + StripableColorDialog _color_picker; + static void set_showing_sends_to (boost::shared_ptr<ARDOUR::Route>); static boost::weak_ptr<ARDOUR::Route> _showing_sends_to; |