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.cc | |
| 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.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 1802425a5a..c8c48f257e 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -243,6 +243,8 @@ RouteUI::reset () delete mute_menu; mute_menu = 0; + _color_picker.reset (); + denormal_menu_item = 0; } @@ -1604,13 +1606,7 @@ RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check) void RouteUI::choose_color () { - bool picked; - Gdk::Color c (gdk_color_from_rgba (_route->presentation_info().color())); - Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &c); - - if (picked) { - set_color (gdk_color_to_rgba (color)); - } + _color_picker.popup (_route); } /** Set the route's own color. This may not be used for display if |