summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Loftis <ben@glw.com>2012-12-07 17:00:49 +0000
committerBen Loftis <ben@glw.com>2012-12-07 17:00:49 +0000
commitb3ab885061e627bc351b03794f306ad4025154a0 (patch)
tree5989e47e9a5e82d44c4e81ecf988992b76409c84
parent8ca9061b308238ba80d82b6960e79fa1ea5cda92 (diff)
fix flat button colors
git-svn-id: svn://localhost/ardour2/branches/3.0@13614 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/ardour_button.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index f24b60148d..c3d67a8462 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -477,10 +477,10 @@ ArdourButton::set_colors ()
cairo_pattern_add_color_stop_rgba (shine_pattern, 1, 1,1,1,0.1);
fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
- start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
if (_flat_buttons) {
- end_color = start_color;
+ end_color = start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
} else {
+ start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
end_color = fill_color_inactive;
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
@@ -489,10 +489,10 @@ ArdourButton::set_colors ()
cairo_pattern_add_color_stop_rgba (fill_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
fill_pattern_active = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
- start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
if (_flat_buttons) {
- end_color = start_color;
+ end_color = start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
} else {
+ start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);