ardour/livetrax
13
0
Fork 0
Code

Prevent multiple color-picker dialogs for a single stripable

Browse Source
This commit is contained in:
Robin Gareus 2017-03-12 16:54:38 +01:00
parent be6bfd12eb
commit 400b3f82e7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/stripable_colorpicker.cc
View File

@ -70,12 +70,19 @@ void
StripableColorDialog::reset ()
{
hide ();
if (_stripable && _stripable->active_color_picker() == this) {
_stripable->set_active_color_picker (0);
}
_stripable.reset ();
}
void
StripableColorDialog::popup (boost::shared_ptr<ARDOUR::Stripable> s)
{
if (s && s->active_color_picker()) {
s->active_color_picker()->present ();
return;
}
if (_stripable == s) {
/* keep modified color */
present ();
@ -83,6 +90,7 @@ StripableColorDialog::popup (boost::shared_ptr<ARDOUR::Stripable> s)
}
_stripable = s;
_stripable->set_active_color_picker (this);
set_title (string_compose (_("Color Selection: %1"), s->name()));
get_colorsel()->set_has_opacity_control (false);