ardour/livetrax
13
0
Fork 0
Code

repair ardour-button "fixed color mode"

Browse Source
This commit is contained in:
Robin Gareus 2014-07-06 19:55:49 +02:00
parent 881703144c
commit 381b6848fc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/ardour_button.cc
View File

@ -87,6 +87,7 @@ ArdourButton::ArdourButton (Element e)
, _distinct_led_click (false) , _distinct_led_click (false)
, _hovering (false) , _hovering (false)
, _focused (false) , _focused (false)
, _fixed_colors_set (false)
{ {
ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler)); ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
} }
@ -124,6 +125,7 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
, _distinct_led_click (false) , _distinct_led_click (false)
, _hovering (false) , _hovering (false)
, _focused (false) , _focused (false)
, _fixed_colors_set (false)
{ {
set_text (str); set_text (str);
} }
@ -532,6 +534,9 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
void void
ArdourButton::set_colors () ArdourButton::set_colors ()
{ {
if (_fixed_colors_set) {
return;
}
std::string name = get_name(); std::string name = get_name();
border_color = ARDOUR_UI::config()->color_by_name ("button border"); border_color = ARDOUR_UI::config()->color_by_name ("button border");
@ -555,9 +560,7 @@ ArdourButton::set_colors ()
*/ */
void ArdourButton::set_fixed_colors (const uint32_t color_active, const uint32_t color_inactive) void ArdourButton::set_fixed_colors (const uint32_t color_active, const uint32_t color_inactive)
{ {
set_name (""); /* this will trigger a "style-changed" message and then _fixed_colors_set = true;
set_colors()
*/
fill_start_active_color = fill_end_active_color = color_active; fill_start_active_color = fill_end_active_color = color_active;
@ -582,6 +585,7 @@ void ArdourButton::set_fixed_colors (const uint32_t color_active, const uint32_t
/* XXX what about led colors ? */ /* XXX what about led colors ? */
build_patterns (); build_patterns ();
set_name (""); /* this will trigger a "style-changed" message and then set_colors() */
} }
void void

1
gtk2_ardour/ardour_button.h
View File

@ -172,6 +172,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
bool _distinct_led_click; bool _distinct_led_click;
bool _hovering; bool _hovering;
bool _focused; bool _focused;
bool _fixed_colors_set;
static bool _flat_buttons; static bool _flat_buttons;