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/vca_master_strip.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/vca_master_strip.h')
| -rw-r--r-- | gtk2_ardour/vca_master_strip.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h index 6cc728ea52..0694b15e23 100644 --- a/gtk2_ardour/vca_master_strip.h +++ b/gtk2_ardour/vca_master_strip.h @@ -23,11 +23,13 @@ #include <gtkmm/box.h> #include <gtkmm/menuitem.h> +#include <gtkmm/colorselection.h> #include "ardour_button.h" #include "axis_view.h" #include "control_slave_ui.h" #include "gain_meter.h" +#include "stripable_colorpicker.h" namespace ARDOUR { class GainControl; @@ -107,7 +109,7 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox void update_bottom_padding (); void start_color_edit (); - void finish_color_edit (int, Gtk::ColorSelectionDialog*); + StripableColorDialog _color_picker; }; |