ardour/livetrax
13
0
Fork 0
Code

introduce flat button option,which right now is on all the time. GUI nit-pickers, do your best

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12358 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-21 12:31:05 +00:00
parent c7e9102437
commit a796853f99
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk2_ardour/ardour_button.cc
View File

@ -49,6 +49,7 @@ using namespace std;
ArdourButton::Element ArdourButton::default_elements = ArdourButton::Element (ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text);
ArdourButton::Element ArdourButton::led_default_elements = ArdourButton::Element (ArdourButton::default_elements|ArdourButton::Indicator);
ArdourButton::Element ArdourButton::just_led_default_elements = ArdourButton::Element (ArdourButton::Edge|ArdourButton::Body|ArdourButton::Indicator);
bool ArdourButton::_flat_buttons = true;
ArdourButton::ArdourButton (Element e)
: _elements (e)
@ -382,10 +383,18 @@ ArdourButton::set_colors ()
edge_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
if (visual_state() & Gtkmm2ext::Selected) {
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start selected", get_name()));
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end selected", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end selected", get_name()));
}
} else {
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start", get_name()));
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", get_name()));
}
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (edge_pattern, 0, r/255.0,g/255.0,b/255.0, 0.7);
@ -407,7 +416,12 @@ ArdourButton::set_colors ()
active_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
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()));
if (_flat_buttons) {
end_color = start_color;
} else {
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);
active_r = r/255.0;
@ -421,7 +435,11 @@ ArdourButton::set_colors ()
inactive_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (inactive_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
UINT_TO_RGBA (end_color, &r, &g, &b, &a);
@ -764,3 +782,9 @@ ArdourButton::set_elements (Element e)
_elements = e;
set_colors ();
}
void
ArdourButton::set_flat_buttons (bool yn)
{
_flat_buttons = yn;
}

5
gtk2_ardour/ardour_button.h
View File

@ -44,6 +44,9 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
static Element led_default_elements;
static Element just_led_default_elements;
static void set_flat_buttons (bool yn);
static bool flat_buttons() { return _flat_buttons; }
ArdourButton (Element e = default_elements);
ArdourButton (const std::string&, Element e = default_elements);
virtual ~ArdourButton ();
@ -142,6 +145,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
bool _distinct_led_click;
bool _hovering;
static bool _flat_buttons;
void setup_led_rect ();
void set_colors ();
void color_handler ();