ardour/livetrax
13
0
Fork 0
Code

Update stripable color on the fly

Browse Source
This commit is contained in:
Robin Gareus 2017-03-14 17:03:14 +01:00
parent dc98fa6f3f
commit 35407c7fe8
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk2_ardour/stripable_colorpicker.cc
View File

@ -74,6 +74,7 @@ StripableColorDialog::reset ()
_stripable->set_active_color_picker (0);
}
_stripable.reset ();
_color_changed_connection.disconnect ();
}
void
@ -91,15 +92,17 @@ StripableColorDialog::popup (boost::shared_ptr<ARDOUR::Stripable> s)
_stripable = s;
_stripable->set_active_color_picker (this);
_initial_color = _stripable->presentation_info().color ();
set_title (string_compose (_("Color Selection: %1"), s->name()));
get_colorsel()->set_has_opacity_control (false);
get_colorsel()->set_has_palette (true);
Gdk::Color c = gdk_color_from_rgba (_stripable->presentation_info().color ());
Gdk::Color c = gdk_color_from_rgba (_initial_color);
get_colorsel()->set_previous_color (c);
get_colorsel()->set_current_color (c);
_color_changed_connection = get_colorsel()->signal_color_changed().connect (sigc::mem_fun (*this, &StripableColorDialog::color_changed));
present ();
}
@ -109,6 +112,16 @@ StripableColorDialog::finish_color_edit (int response)
{
if (_stripable && response == RESPONSE_OK) {
_stripable->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color()));
} else {
_stripable->presentation_info().set_color (_initial_color);
}
reset ();
}
void
StripableColorDialog::color_changed ()
{
if (_stripable) {
_stripable->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color()));
}
}

4
gtk2_ardour/stripable_colorpicker.h
View File

@ -34,8 +34,12 @@ public:
private:
void initialize_color_palette ();
void finish_color_edit (int response);
void color_changed ();
boost::shared_ptr<ARDOUR::Stripable> _stripable;
ARDOUR::PresentationInfo::color_t _initial_color;
sigc::connection _color_changed_connection;
static bool palette_initialized;