diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index ec8b426a83..006e16d329 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -146,10 +146,7 @@
-
-
-
-
+
@@ -158,10 +155,6 @@
-
-
-
-
@@ -170,10 +163,6 @@
-
-
-
-
@@ -182,10 +171,6 @@
-
-
-
-
@@ -194,10 +179,6 @@
-
-
-
-
@@ -206,10 +187,6 @@
-
-
-
-
@@ -218,10 +195,6 @@
-
-
-
-
@@ -230,10 +203,6 @@
-
-
-
-
@@ -242,10 +211,6 @@
-
-
-
-
@@ -254,10 +219,6 @@
-
-
-
-
@@ -266,10 +227,6 @@
-
-
-
-
@@ -278,10 +235,6 @@
-
-
-
-
@@ -290,10 +243,6 @@
-
-
-
-
@@ -302,10 +251,6 @@
-
-
-
-
@@ -314,10 +259,6 @@
-
-
-
-
@@ -326,10 +267,6 @@
-
-
-
-
@@ -338,10 +275,6 @@
-
-
-
-
@@ -350,10 +283,6 @@
-
-
-
-
@@ -362,10 +291,6 @@
-
-
-
-
@@ -374,10 +299,6 @@
-
-
-
-
@@ -386,10 +307,6 @@
-
-
-
-
@@ -398,10 +315,6 @@
-
-
-
-
@@ -410,10 +323,6 @@
-
-
-
-
@@ -422,10 +331,6 @@
-
-
-
-
@@ -434,10 +339,6 @@
-
-
-
-
@@ -446,10 +347,6 @@
-
-
-
-
@@ -458,10 +355,6 @@
-
-
-
-
@@ -470,10 +363,6 @@
-
-
-
-
@@ -482,10 +371,6 @@
-
-
-
-
@@ -494,10 +379,6 @@
-
-
-
-
@@ -506,10 +387,6 @@
-
-
-
-
@@ -518,10 +395,6 @@
-
-
-
-
@@ -530,10 +403,6 @@
-
-
-
-
@@ -542,10 +411,6 @@
-
-
-
-
@@ -554,10 +419,6 @@
-
-
-
-
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 3e97099703..65bbcc49bc 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -59,9 +59,12 @@ ArdourButton::ArdourButton (Element e)
, _diameter (11.0)
, _corner_radius (5.0)
, _corner_mask (0xf)
- , edge_pattern (0)
- , active_pattern (0)
- , inactive_pattern (0)
+ , border_color (0)
+ , fill_color_active (0)
+ , fill_color_inactive (0)
+ , fill_pattern (0)
+ , fill_pattern_active (0)
+ , shine_pattern (0)
, led_inset_pattern (0)
, reflection_pattern (0)
, _led_rect (0)
@@ -80,11 +83,14 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
, _text_width (0)
, _text_height (0)
, _diameter (11.0)
- , _corner_radius (9.0)
+ , _corner_radius (5.0)
, _corner_mask (0xf)
- , edge_pattern (0)
- , active_pattern (0)
- , inactive_pattern (0)
+ , border_color (0)
+ , fill_color_active (0)
+ , fill_color_inactive (0)
+ , fill_pattern (0)
+ , fill_pattern_active (0)
+ , shine_pattern (0)
, led_inset_pattern (0)
, reflection_pattern (0)
, _led_rect (0)
@@ -101,17 +107,26 @@ ArdourButton::~ArdourButton()
{
delete _led_rect;
- if (edge_pattern) {
- cairo_pattern_destroy (edge_pattern);
+ if (shine_pattern) {
+ cairo_pattern_destroy (shine_pattern);
}
- if (active_pattern) {
- cairo_pattern_destroy (active_pattern);
+ if (fill_pattern) {
+ cairo_pattern_destroy (fill_pattern);
+ }
+
+ if (fill_pattern_active) {
+ cairo_pattern_destroy (fill_pattern_active);
+ }
+
+ if (led_inset_pattern) {
+ cairo_pattern_destroy (led_inset_pattern);
+ }
+
+ if (reflection_pattern) {
+ cairo_pattern_destroy (reflection_pattern);
}
- if (inactive_pattern) {
- cairo_pattern_destroy (inactive_pattern);
- }
}
void
@@ -169,9 +184,13 @@ ArdourButton::render (cairo_t* cr)
_diameter = std::min (get_width(), get_height());
}
+ float r,g,b,a;
+
if (_elements & Edge) {
rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
- cairo_set_source (cr, edge_pattern);
+ UINT_TO_RGBA (border_color, &r, &g, &b, &a);
+ //cairo_set_source_rgba (cr, r/255.0,g/255.0,b/255.0,a/255.0); //TODO: why doesn't this work?
+ cairo_set_source_rgba (cr, 0,0,0,0.9);
cairo_fill (cr);
}
@@ -179,21 +198,51 @@ ArdourButton::render (cairo_t* cr)
if (_elements & Edge) {
rounded_function (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius - 1.0);
} else {
- rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius - 1.0);
+ rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
}
if (active_state() == Gtkmm2ext::ImplicitActive) {
- cairo_set_source (cr, inactive_pattern);
+ //background color
+ cairo_set_source (cr, fill_pattern);
cairo_fill_preserve (cr);
+
+ //border
+ UINT_TO_RGBA (fill_color_active, &r, &g, &b, &a);
cairo_set_line_width (cr, 2.0);
- cairo_set_source (cr, active_pattern);
+// rounded_function (cr, 3, 3, get_width()-6, get_height()-6, _corner_radius - 1.0);
+ cairo_set_source_rgba (cr, r/255.0, g/255.0, b/255.0, a/255.0);
cairo_stroke (cr);
+
+ //reflection
+ if (!_flat_buttons) {
+ rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
+ cairo_set_source (cr, shine_pattern);
+ cairo_fill (cr);
+ }
} else if (active_state() == Gtkmm2ext::ExplicitActive) {
- cairo_set_source (cr, active_pattern);
+
+ //background color
+ cairo_set_source (cr, fill_pattern_active);
cairo_fill (cr);
+
+ //reflection
+ if (!_flat_buttons) {
+ rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
+ cairo_set_source (cr, shine_pattern);
+ cairo_fill (cr);
+ }
} else {
- cairo_set_source (cr, inactive_pattern);
+
+ //background color
+ cairo_set_source (cr, fill_pattern);
cairo_fill (cr);
+
+ //reflection
+ if (!_flat_buttons) {
+ rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
+ cairo_set_source (cr, shine_pattern);
+ cairo_fill (cr);
+ }
}
}
@@ -373,54 +422,34 @@ ArdourButton::set_colors ()
* color/pattern used there will vary depending on that
*/
- if (edge_pattern) {
- cairo_pattern_destroy (edge_pattern);
- edge_pattern = 0;
+ fill_color_active = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
+ fill_color_inactive = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
+ border_color = ARDOUR_UI::config()->color_by_name ( "button border" );
+
+ if (shine_pattern) {
+ cairo_pattern_destroy (shine_pattern);
+ shine_pattern = 0;
}
- if (_elements & Edge) {
-
- 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()));
- 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()));
- 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);
- UINT_TO_RGBA (end_color, &r, &g, &b, &a);
- cairo_pattern_add_color_stop_rgba (edge_pattern, 1, r/255.0,g/255.0,b/255.0, 0.7);
+ if (fill_pattern) {
+ cairo_pattern_destroy (fill_pattern);
+ fill_pattern = 0;
}
- if (active_pattern) {
- cairo_pattern_destroy (active_pattern);
- active_pattern = 0;
- }
-
- if (inactive_pattern) {
- cairo_pattern_destroy (inactive_pattern);
- inactive_pattern = 0;
+ if (fill_pattern_active) {
+ cairo_pattern_destroy (fill_pattern_active);
+ fill_pattern_active = 0;
}
if (_elements & Body) {
- active_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
+ shine_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()/2-2);
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start 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()));
+ end_color = fill_color_active;
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
@@ -429,21 +458,33 @@ ArdourButton::set_colors ()
active_b = b/255.0;
active_a = a/255.0;
- cairo_pattern_add_color_stop_rgba (active_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
- UINT_TO_RGBA (end_color, &r, &g, &b, &a);
- cairo_pattern_add_color_stop_rgba (active_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+ cairo_pattern_add_color_stop_rgba (shine_pattern, 0, 1,1,1,0.1);
+ cairo_pattern_add_color_stop_rgba (shine_pattern, 0.2, 1,1,1,0.4);
+ cairo_pattern_add_color_stop_rgba (shine_pattern, 1, 1,1,1,0.1);
- inactive_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
+ 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;
} else {
- end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
+ end_color = fill_color_inactive;
}
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);
+ cairo_pattern_add_color_stop_rgba (fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
UINT_TO_RGBA (end_color, &r, &g, &b, &a);
- cairo_pattern_add_color_stop_rgba (inactive_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+ 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;
+ } 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);
+ cairo_pattern_add_color_stop_rgba (fill_pattern_active, 0, r/255.0,g/255.0,b/255.0, a/255.0);
+ UINT_TO_RGBA (end_color, &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgba (fill_pattern_active, 1, r/255.0,g/255.0,b/255.0, a/255.0);
}
if (led_inset_pattern) {
diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 94b3c6d399..016d80686c 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -116,9 +116,12 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
float _corner_radius;
int _corner_mask;
- cairo_pattern_t* edge_pattern;
- cairo_pattern_t* active_pattern;
- cairo_pattern_t* inactive_pattern;
+ uint32_t border_color;
+ uint32_t fill_color_active;
+ uint32_t fill_color_inactive;
+ cairo_pattern_t* fill_pattern;
+ cairo_pattern_t* fill_pattern_active;
+ cairo_pattern_t* shine_pattern;
cairo_pattern_t* led_inset_pattern;
cairo_pattern_t* reflection_pattern;
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 672d4e1256..b4a570836e 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -141,11 +141,8 @@ CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
CANVAS_VARIABLE(canvasvar_MonitorSectionKnob, "monitor knob")
+CANVAS_VARIABLE(canvasvar_ButtonBorder, "border color")
#define BUTTON_VARS(root,name) \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name ": border start") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name ": border end") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name ": border start selected") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name ": border end selected") \
CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name ": fill start") \
CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name ": fill end") \
CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name ": fill start active") \
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index de5b0717ac..792da29170 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2905,22 +2905,19 @@ Editor::setup_toolbar ()
RefPtr act;
zoom_in_button.set_name ("zoom button");
- zoom_in_button.set_image (::get_icon ("zoom_in"));
- zoom_in_button.set_tweaks (ArdourButton::ShowClick);
+ zoom_in_button.add (*(manage (new Image (::get_icon ("zoom_in")))));
act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-in"));
- zoom_in_button.set_related_action (act);
+ act->connect_proxy (zoom_in_button);
zoom_out_button.set_name ("zoom button");
- zoom_out_button.set_image (::get_icon ("zoom_out"));
- zoom_out_button.set_tweaks (ArdourButton::ShowClick);
+ zoom_out_button.add (*(manage (new Image (::get_icon ("zoom_out")))));
act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-out"));
- zoom_out_button.set_related_action (act);
+ act->connect_proxy (zoom_out_button);
zoom_out_full_button.set_name ("zoom button");
- zoom_out_full_button.set_image (::get_icon ("zoom_full"));
- zoom_out_full_button.set_tweaks (ArdourButton::ShowClick);
+ zoom_out_full_button.add (*(manage (new Image (::get_icon ("zoom_full")))));
act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session"));
- zoom_out_full_button.set_related_action (act);
+ act->connect_proxy (zoom_out_full_button);
zoom_focus_selector.set_name ("ZoomFocusSelector");
set_popdown_strings (zoom_focus_selector, zoom_focus_strings);
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index f3860812f2..2075a53270 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1562,9 +1562,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void editor_list_button_toggled ();
AudioClock* zoom_range_clock;
- ArdourButton zoom_in_button;
- ArdourButton zoom_out_button;
- ArdourButton zoom_out_full_button;
+ Gtk::Button zoom_in_button;
+ Gtk::Button zoom_out_button;
+ Gtk::Button zoom_out_full_button;
Gtk::Button tav_expand_button;
Gtk::Button tav_shrink_button;