#include <pangomm/layout.h>
#include "pbd/compose.h"
+#include "pbd/controllable.h"
#include "pbd/error.h"
#include "pbd/stacktrace.h"
#include "gtkmm2ext/rgb_macros.h"
#include "gtkmm2ext/gui_thread.h"
-#include "ardour/rc_configuration.h" // for widget prelight preference
-
#include "canvas/utils.h"
#include "canvas/colors.h"
#include "ardour_button.h"
-#include "ardour_ui.h"
-#include "global_signals.h"
+#include "tooltips.h"
+#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
#define BASELINESTRETCH (1.25)
#define TRACKHEADERBTNW (3.10)
using namespace Gtk;
using namespace Glib;
using namespace PBD;
+using namespace ARDOUR_UI_UTILS;
using std::max;
using std::min;
using namespace std;
ArdourButton::ArdourButton (Element e)
: _elements (e)
- , _icon (ArdourButton::NoIcon)
+ , _icon (Gtkmm2ext::ArdourIcon::NoIcon)
, _tweaks (Tweaks (0))
, _char_pixel_width (0)
, _char_pixel_height (0)
, _update_colors (true)
, _pattern_height (0)
{
- ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
+ UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
}
ArdourButton::ArdourButton (const std::string& str, Element e)
: _elements (e)
, _tweaks (Tweaks (0))
+ , _char_pixel_width (0)
+ , _char_pixel_height (0)
+ , _char_avg_pixel_width (0)
, _text_width (0)
, _text_height (0)
, _diameter (0)
, _pattern_height (0)
{
set_text (str);
- ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
- ARDOUR_UI_UTILS::DPIReset.connect (sigc::mem_fun (*this, &ArdourButton::on_name_changed));
+ UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
+ UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &ArdourButton::on_name_changed));
}
ArdourButton::~ArdourButton()
void
ArdourButton::set_text (const std::string& str)
{
+ if (_text == str) {
+ return;
+ }
_text = str;
if (!is_realized()) {
return;
/* TODO make this a dedicated function elsewhere.
*
* Option 1:
- * virtual ArdourButton::render_vector_icon()
+ * virtual ArdourButton::render_vector_icon()
* ArdourIconButton::render_vector_icon
*
* Option 2:
* ARDOUR_UI_UTILS::render_vector_icon()
*/
-static void
-render_vector_icon (cairo_t *cr,
- const enum ArdourButton::Icon icon,
- const int width, const int height,
- const Gtkmm2ext::ActiveState state,
- const ArdourCanvas::Color fg_color)
-{
-
-#define VECTORICONSTROKEFILL(fillalpha) \
- cairo_set_line_width(cr, 1.5); \
- cairo_set_source_rgba (cr, 0, 0, 0, 1.0); \
- cairo_stroke_preserve(cr); \
- cairo_set_source_rgba (cr, 1, 1, 1, (fillalpha)); \
- cairo_fill(cr);
-
-#define VECTORICONSTROKEOUTLINE() \
- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); \
- cairo_set_line_width(cr, 3.0); \
- cairo_set_source_rgba (cr, 0, 0, 0, 1.0); \
- cairo_stroke_preserve(cr); \
- ArdourCanvas::set_source_rgba (cr, fg_color); \
- cairo_set_line_width(cr, 1.5); \
- cairo_stroke(cr);
-
-
- /* TODO separate these into dedicated class
- * it may also be efficient to render them only once for every size (image-surface) */
- switch (icon) {
-
- case ArdourButton::RecTapeMode:
- {
- const double x = width * .5;
- const double y = height * .5;
- const double r = std::min(x, y) * .6;
- const double slit = .11 * M_PI;
- cairo_save(cr);
- cairo_translate(cr, x, y);
-
- cairo_arc (cr, 0, 0, r, 0, 2 * M_PI);
- if (state == Gtkmm2ext::ExplicitActive) {
- cairo_set_source_rgba (cr, .95, .1, .1, 1.);
- } else {
- cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
- }
- cairo_fill_preserve(cr);
- cairo_set_source_rgba (cr, .0, .0, .0, .5);
- cairo_set_line_width(cr, 1);
- cairo_stroke(cr);
-
- cairo_save(cr);
- cairo_set_source_rgba (cr, .15, .07, .07, 1.0);
-
- cairo_rotate (cr, -.5 * M_PI);
- cairo_move_to(cr, 0, 0);
- cairo_arc (cr, 0, 0, r *.85, -slit, slit);
- cairo_line_to(cr, 0, 0);
- cairo_close_path(cr);
-
- cairo_fill(cr);
- cairo_rotate (cr, 2. * M_PI / 3.);
-
- cairo_move_to(cr, 0, 0);
- cairo_arc (cr, 0, 0, r *.85, -slit, slit);
- cairo_line_to(cr, 0, 0);
- cairo_close_path(cr);
- cairo_fill(cr);
-
- cairo_rotate (cr, 2. * M_PI / 3.);
- cairo_move_to(cr, 0, 0);
- cairo_arc (cr, 0, 0, r *.85, -slit, slit);
- cairo_line_to(cr, 0, 0);
- cairo_close_path(cr);
- cairo_fill(cr);
-
- cairo_restore(cr);
-
- cairo_arc (cr, 0, 0, r * .3, 0, 2 * M_PI);
- if (state == Gtkmm2ext::ExplicitActive)
- cairo_set_source_rgba (cr, .95, .1, .1, 1.);
- else
- cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
- cairo_fill(cr);
- cairo_set_source_rgba (cr, .0, .0, .0, 1.0);
- cairo_arc (cr, 0, 0, r *.15, 0, 2 * M_PI); // hole in the middle
- cairo_fill(cr);
-
- cairo_restore(cr);
- }
- break;
- case ArdourButton::RecButton:
- {
- const double x = width * .5;
- const double y = height * .5;
- const double r = std::min(x, y) * .55;
- cairo_arc (cr, x, y, r, 0, 2 * M_PI);
- if (state == Gtkmm2ext::ExplicitActive)
- cairo_set_source_rgba (cr, .95, .1, .1, 1.);
- else
- cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
- cairo_fill_preserve(cr);
- cairo_set_source_rgba (cr, .0, .0, .0, .8);
- cairo_set_line_width(cr, 1);
- cairo_stroke(cr);
- }
- break;
- case ArdourButton::CloseCross:
- {
- const double x = width * .5;
- const double y = height * .5;
- const double o = .5 + std::min(x, y) * .4;
- ArdourCanvas::set_source_rgba (cr, fg_color);
- cairo_set_line_width(cr, 1);
- cairo_move_to(cr, x-o, y-o);
- cairo_line_to(cr, x+o, y+o);
- cairo_move_to(cr, x+o, y-o);
- cairo_line_to(cr, x-o, y+o);
- cairo_stroke(cr);
- }
- break;
- case ArdourButton::StripWidth:
- {
- const double x0 = width * .2;
- const double x1 = width * .8;
-
- const double y0 = height * .25;
- const double y1= height * .75;
-
- const double ym= height * .5;
-
- // arrow
- const double xa0= height * .39;
- const double xa1= height * .61;
- const double ya0= height * .35;
- const double ya1= height * .65;
-
- ArdourCanvas::set_source_rgba (cr, fg_color);
- cairo_set_line_width(cr, 1);
-
- // left + right
- cairo_move_to(cr, x0, y0);
- cairo_line_to(cr, x0, y1);
- cairo_move_to(cr, x1, y0);
- cairo_line_to(cr, x1, y1);
-
- // horiz center line
- cairo_move_to(cr, x0, ym);
- cairo_line_to(cr, x1, ym);
-
- // arrow left
- cairo_move_to(cr, x0, ym);
- cairo_line_to(cr, xa0, ya0);
- cairo_move_to(cr, x0, ym);
- cairo_line_to(cr, xa0, ya1);
-
- // arrow right
- cairo_move_to(cr, x1, ym);
- cairo_line_to(cr, xa1, ya0);
- cairo_move_to(cr, x1, ym);
- cairo_line_to(cr, xa1, ya1);
- cairo_stroke(cr);
- }
- break;
- case ArdourButton::DinMidi:
- {
- const double x = width * .5;
- const double y = height * .5;
- const double r = std::min(x, y) * .75;
- ArdourCanvas::set_source_rgba (cr, fg_color);
- cairo_set_line_width(cr, 1);
- cairo_arc (cr, x, y, r, .57 * M_PI, 2.43 * M_PI);
- cairo_stroke(cr);
-
- // pins equally spaced 45deg
- cairo_arc (cr, x, y * 0.5, r * .15, 0, 2 * M_PI);
- cairo_fill(cr);
- cairo_arc (cr, x * 0.5, y, r * .15, 0, 2 * M_PI);
- cairo_fill(cr);
- cairo_arc (cr, x * 1.5, y, r * .15, 0, 2 * M_PI);
- cairo_fill(cr);
- // .5 + .5 * .5 * sin(45deg), 1.5 - .5 * .5 * cos(45deg)
- cairo_arc (cr, x * 0.677, y * .677, r * .15, 0, 2 * M_PI);
- cairo_fill(cr);
- cairo_arc (cr, x * 1.323, y * .677, r * .15, 0, 2 * M_PI);
- cairo_fill(cr);
-
- // bottom notch
- cairo_arc (cr, x, y+r, r * .26, 1.05 * M_PI, 1.95 * M_PI);
- cairo_stroke(cr);
- }
- break;
- case ArdourButton::TransportStop:
- {
- const int wh = std::min (width, height);
- cairo_rectangle (cr,
- (width - wh) * .5 + wh * .25,
- (height - wh) * .5 + wh * .25,
- wh * .5, wh * .5);
-
- VECTORICONSTROKEFILL(0.8);
- }
- break;
- case ArdourButton::TransportPlay:
- {
- const int wh = std::min (width, height) * .5;
- const double y = height * .5;
- const double x = width - wh;
-
- const float tri = ceil(.577 * wh); // 1/sqrt(3)
-
- cairo_move_to (cr, x + wh * .5, y);
- cairo_line_to (cr, x - wh * .5, y - tri);
- cairo_line_to (cr, x - wh * .5, y + tri);
- cairo_close_path (cr);
-
- VECTORICONSTROKEFILL(0.8);
- }
- break;
- case ArdourButton::TransportPanic:
- {
- const int wh = std::min (width, height) * .1;
- const double xc = width * .5;
- const double yh = height;
- cairo_rectangle (cr,
- xc - wh, yh *.19,
- wh * 2, yh *.41);
- VECTORICONSTROKEFILL(0.8);
-
- cairo_arc (cr, xc, yh *.75, wh, 0, 2 * M_PI);
- VECTORICONSTROKEFILL(0.8);
- }
- break;
- case ArdourButton::TransportStart:
- case ArdourButton::TransportEnd:
- case ArdourButton::TransportRange:
- {
- // small play triangle
- int wh = std::min (width, height);
- const double y = height * .5;
- const double x = width - wh * .5;
- wh *= .18;
- const float tri = ceil(.577 * wh * 2); // 1/sqrt(3)
-
- const float ln = std::min (width, height) * .07;
-
- if (icon == ArdourButton::TransportStart || icon == ArdourButton::TransportRange) {
- cairo_rectangle (cr,
- x - wh - ln, y - tri * 1.7,
- ln * 2, tri * 3.4);
-
- VECTORICONSTROKEFILL(1.0);
- }
-
- if (icon == ArdourButton::TransportEnd || icon == ArdourButton::TransportRange) {
- cairo_rectangle (cr,
- x + wh - ln, y - tri * 1.7,
- ln * 2, tri * 3.4);
-
- VECTORICONSTROKEFILL(1.0);
- }
-
- if (icon == ArdourButton::TransportStart) {
- cairo_move_to (cr, x - wh, y);
- cairo_line_to (cr, x + wh, y - tri);
- cairo_line_to (cr, x + wh, y + tri);
- } else {
- cairo_move_to (cr, x + wh, y);
- cairo_line_to (cr, x - wh, y - tri);
- cairo_line_to (cr, x - wh, y + tri);
- }
-
- cairo_close_path (cr);
- VECTORICONSTROKEFILL(1.0);
- }
- break;
- case ArdourButton::TransportLoop:
- {
- const double x = width * .5;
- const double y = height * .5;
- const double r = std::min(x, y);
-
- cairo_arc (cr, x, y, r * .62, 0, 2 * M_PI);
- cairo_arc_negative (cr, x, y, r * .35, 2 * M_PI, 0);
-
- VECTORICONSTROKEFILL(1.0);
-#define ARCARROW(rad, ang) \
- x + (rad) * sin((ang) * 2.0 * M_PI), y + (rad) * cos((ang) * 2.0 * M_PI)
-
- cairo_move_to (cr, ARCARROW(r * .35, .72));
- cairo_line_to (cr, ARCARROW(r * .15, .72));
- cairo_line_to (cr, ARCARROW(r * .56, .60));
- cairo_line_to (cr, ARCARROW(r * .75, .72));
- cairo_line_to (cr, ARCARROW(r * .62, .72));
-
- cairo_set_source_rgba (cr, 0, 0, 0, 1.0);
- cairo_stroke_preserve(cr);
- cairo_close_path (cr);
- cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
- cairo_fill(cr);
-#undef ARCARROW
- }
- break;
- case ArdourButton::TransportMetronom:
- {
- const double x = width * .5;
- const double y = height * .5;
- const double wh = std::min(x, y);
- const double h = wh * .85;
- const double w = wh * .55;
- const double lw = w * .34;
-
- cairo_rectangle (cr,
- x - w * .7, y + h * .25,
- w * 1.4, lw);
-
- VECTORICONSTROKEFILL(1.0);
-
- cairo_move_to (cr, x - w, y + h);
- cairo_line_to (cr, x + w, y + h);
- cairo_line_to (cr, x + w * .35, y - h);
- cairo_line_to (cr, x - w * .35, y - h);
- cairo_line_to (cr, x - w, y + h);
-
- cairo_move_to (cr, x - w + lw, y + h -lw);
- cairo_line_to (cr, x - w * .35 + lw, y - h + lw);
- cairo_line_to (cr, x + w * .35 - lw, y - h + lw);
- cairo_line_to (cr, x + w - lw, y + h -lw);
- cairo_line_to (cr, x - w + lw, y + h -lw);
-
- VECTORICONSTROKEFILL(1.0);
-
- // ddx = .70 w = .75 * .5 wh = .375 wh
- // ddy = .75 h - lw = .75 * .8 wh - wh .5 * .2 = .5 wh
- // ang = (ddx/ddy):
- // -> angle = atan (ang) = atan (375 / .5) ~= 36deg
- const double dx = lw * .2; // 1 - cos(tan^-1(ang))
- const double dy = lw * .4; // 1 - sin(tan^-1(ang))
- cairo_move_to (cr, x - w * .3 , y + h * .25 + lw * .5);
- cairo_line_to (cr, x - w + dx , y - h + lw + dy);
- cairo_line_to (cr, x - w + lw , y - h + lw);
- cairo_line_to (cr, x - w * .3 + lw, y + h * .25 + lw * .5);
- cairo_close_path (cr);
-
- VECTORICONSTROKEFILL(1.0);
-
- cairo_rectangle (cr,
- x - w * .7, y + h * .25,
- w * 1.4, lw);
- cairo_fill(cr);
- }
- break;
- case ArdourButton::NudgeLeft:
- {
- const double x = width * .5;
- const double y = height * .5;
- const double wh = std::min (x, y);
-
- const double tri_x = .3 * wh;
- const double tri_y = .6 * wh;
-
- cairo_move_to (cr, x + tri_x, y - tri_y);
- cairo_line_to (cr, x - tri_x, y);
- cairo_line_to (cr, x + tri_x, y + tri_y);
- VECTORICONSTROKEOUTLINE();
- }
- break;
- case ArdourButton::NudgeRight:
- {
-
- const double x = width * .5;
- const double y = height * .5;
- const double wh = std::min (x, y);
-
- const double tri_x = .3 * wh;
- const double tri_y = .6 * wh;
-
- cairo_move_to (cr, x - tri_x, y - tri_y);
- cairo_line_to (cr, x + tri_x, y);
- cairo_line_to (cr, x - tri_x, y + tri_y);
- VECTORICONSTROKEOUTLINE();
-
- }
- break;
- default:
- // missing icon
- assert(0);
- } // end case(icon)
-#undef VECTORICONSTROKEFILL
-}
-
void
ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
{
uint32_t text_color;
uint32_t led_color;
- const float corner_radius = std::max(2.f, _corner_radius * ARDOUR_UI::ui_scale);
+ const float corner_radius = std::max(2.f, _corner_radius * UIConfiguration::instance().get_ui_scale());
if (_update_colors) {
set_colors ();
}
//show the "convex" or "concave" gradient
- if (!_flat_buttons) {
+ if (!_flat_buttons && (_elements & Body)==Body) {
if ( active_state() == Gtkmm2ext::ExplicitActive && ( !((_elements & Indicator)==Indicator) || use_custom_led_color) ) {
//concave
cairo_set_source (cr, concave_pattern);
}
else /* VectorIcons are exclusive to Pixbuf Icons */
if (_elements & VectorIcon) {
- render_vector_icon (cr, _icon, get_width(), get_height(), active_state(), text_color);
+ Gtkmm2ext::ArdourIcon::render (cr, _icon, get_width(), get_height(), active_state(), text_color);
}
const int text_margin = char_pixel_width();
//black ring
cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_arc (cr, 0, 0, _diameter * .5 - 1 * ARDOUR_UI::ui_scale, 0, 2 * M_PI);
+ cairo_arc (cr, 0, 0, _diameter * .5 - 1 * UIConfiguration::instance().get_ui_scale(), 0, 2 * M_PI);
cairo_fill(cr);
//led color
ArdourCanvas::set_source_rgba (cr, led_color);
- cairo_arc (cr, 0, 0, _diameter * .5 - 3 * ARDOUR_UI::ui_scale, 0, 2 * M_PI);
+ cairo_arc (cr, 0, 0, _diameter * .5 - 3 * UIConfiguration::instance().get_ui_scale(), 0, 2 * M_PI);
cairo_fill(cr);
cairo_restore (cr);
// a transparent overlay to indicate insensitivity
if ((visual_state() & Gtkmm2ext::Insensitive)) {
rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius);
- uint32_t ins_color = ARDOUR_UI::config()->color ("gtk_background");
+ uint32_t ins_color = UIConfiguration::instance().color ("gtk_background");
ArdourCanvas::set_source_rgb_a (cr, ins_color, 0.6);
cairo_fill (cr);
}
// if requested, show hovering
- if (ARDOUR_UI::config()->get_widget_prelight()
+ if (UIConfiguration::instance().get_widget_prelight()
&& !((visual_state() & Gtkmm2ext::Insensitive))) {
if (_hovering) {
rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
CairoWidget::on_size_request (req);
if (_diameter == 0) {
- const float newdia = rintf (11.f * ARDOUR_UI::ui_scale);
+ const float newdia = rintf (11.f * UIConfiguration::instance().get_ui_scale());
if (_diameter != newdia) {
_pattern_height = 0;
_diameter = newdia;
}
}
- if ((_elements & Text) && !_text.empty()) {
- // if _layout does not exist, char_pixel_height() creates it,
- req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0));
- _layout->get_pixel_size (_text_width, _text_height);
- req->width += rint(1.75 * char_pixel_width()); // padding
- req->width += _text_width;
+ if (_elements & Text) {
+
+ if (_tweaks & OccasionalText) {
+
+ /* size should not change based on presence or absence
+ * of text.
+ */
+
+ if (!_text.empty()) {
+ ensure_layout ();
+ _layout->set_text (_text);
+ _layout->get_pixel_size (_text_width, _text_height);
+ }
+
+ } else if (!_text.empty()) {
+
+ //if _layout does not exist, char_pixel_height() creates it,
+
+ req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0));
+ assert (_layout);
+ _layout->get_pixel_size (_text_width, _text_height);
+ req->width += rint(1.75 * char_pixel_width()); // padding
+ req->width += _text_width;
+ }
+
+ /* XXX hack (surprise). Deal with two common rotation angles */
+
+ if (_angle == 90 || _angle == 270) {
+ /* do not swap text width or height because we rely on
+ these being the un-rotated values in ::render()
+ */
+ swap (req->width, req->height);
+ }
+
} else {
_text_width = 0;
_text_height = 0;
if (_elements & VectorIcon) {
assert(!(_elements & Text));
- const int wh = std::max (rint (TRACKHEADERBTNW * char_avg_pixel_width()), ceil (char_pixel_height() * BASELINESTRETCH + 1.));
+ const int wh = std::max (6., std::max (rint (TRACKHEADERBTNW * char_avg_pixel_width()), ceil (char_pixel_height() * BASELINESTRETCH + 1.)));
req->width += wh;
req->height = std::max(req->height, wh);
}
ArdourButton::set_colors ()
{
_update_colors = false;
- if (_fixed_colors_set) {
+
+ if (_fixed_colors_set == 0x3) {
return;
}
+
std::string name = get_name();
bool failed = false;
- fill_active_color = ARDOUR_UI::config()->color (string_compose ("%1: fill active", name), &failed);
- if (failed) {
- fill_active_color = ARDOUR_UI::config()->color ("generic button: fill active");
+ if (!(_fixed_colors_set & 0x1)) {
+ fill_active_color = UIConfiguration::instance().color (string_compose ("%1: fill active", name), &failed);
+ if (failed) {
+ fill_active_color = UIConfiguration::instance().color ("generic button: fill active");
+ }
}
- fill_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: fill", name), &failed);
- if (failed) {
- fill_inactive_color = ARDOUR_UI::config()->color ("generic button: fill");
+
+ if (!(_fixed_colors_set & 0x2)) {
+ fill_inactive_color = UIConfiguration::instance().color (string_compose ("%1: fill", name), &failed);
+ if (failed) {
+ fill_inactive_color = UIConfiguration::instance().color ("generic button: fill");
+ }
}
text_active_color = ArdourCanvas::contrasting_text_color (fill_active_color);
text_inactive_color = ArdourCanvas::contrasting_text_color (fill_inactive_color);
- led_active_color = ARDOUR_UI::config()->color (string_compose ("%1: led active", name), &failed);
+ led_active_color = UIConfiguration::instance().color (string_compose ("%1: led active", name), &failed);
if (failed) {
- led_active_color = ARDOUR_UI::config()->color ("generic button: led active");
+ led_active_color = UIConfiguration::instance().color ("generic button: led active");
}
/* The inactive color for the LED is just a fairly dark version of the
* active color.
*/
-
+
ArdourCanvas::HSV inactive (led_active_color);
inactive.v = 0.35;
*/
void ArdourButton::set_fixed_colors (const uint32_t color_active, const uint32_t color_inactive)
{
- _fixed_colors_set = true;
+ set_active_color (color_active);
+ set_inactive_color (color_inactive);
+}
+
+void ArdourButton::set_active_color (const uint32_t color)
+{
+ _fixed_colors_set |= 0x1;
- fill_active_color = color_active;
- fill_inactive_color = color_inactive;
+ fill_active_color = color;
unsigned char r, g, b, a;
- UINT_TO_RGBA(color_active, &r, &g, &b, &a);
+ UINT_TO_RGBA(color, &r, &g, &b, &a);
double white_contrast = (max (double(r), 255.) - min (double(r), 255.)) +
(max (double(g), 255.) - min (double(g), 255.)) +
RGBA_TO_UINT(255, 255, 255, 255) : /* use white */
RGBA_TO_UINT( 0, 0, 0, 255); /* use black */
+ /* XXX what about led colors ? */
+ CairoWidget::set_dirty ();
+}
+
+void ArdourButton::set_inactive_color (const uint32_t color)
+{
+ _fixed_colors_set |= 0x2;
- UINT_TO_RGBA(color_inactive, &r, &g, &b, &a);
+ fill_inactive_color = color;
- white_contrast = (max (double(r), 255.) - min (double(r), 255.)) +
+ unsigned char r, g, b, a;
+ UINT_TO_RGBA(color, &r, &g, &b, &a);
+
+ double white_contrast = (max (double(r), 255.) - min (double(r), 255.)) +
(max (double(g), 255.) - min (double(g), 255.)) +
(max (double(b), 255.) - min (double(b), 255.));
- black_contrast = (max (double(r), 0.) - min (double(r), 0.)) +
+ double black_contrast = (max (double(r), 0.) - min (double(r), 0.)) +
(max (double(g), 0.) - min (double(g), 0.)) +
(max (double(b), 0.) - min (double(b), 0.));
bool
ArdourButton::on_button_press_event (GdkEventButton *ev)
{
- focus_handler ();
+ focus_handler (this);
if (ev->button == 1 && (_elements & Indicator) && _led_rect && _distinct_led_click) {
if (ev->x >= _led_rect->x && ev->x < _led_rect->x + _led_rect->width &&
if (ev->button == 1 && _hovering && (_elements & Indicator) && _led_rect && _distinct_led_click) {
if (ev->x >= _led_rect->x && ev->x < _led_rect->x + _led_rect->width &&
ev->y >= _led_rect->y && ev->y < _led_rect->y + _led_rect->height) {
- signal_led_clicked(); /* EMIT SIGNAL */
+ signal_led_clicked(ev); /* EMIT SIGNAL */
return true;
}
}
{
_hovering = (_elements & Inactive) ? false : true;
- if (ARDOUR_UI::config()->get_widget_prelight()) {
+ if (UIConfiguration::instance().get_widget_prelight()) {
CairoWidget::set_dirty ();
}
{
_hovering = false;
- if (ARDOUR_UI::config()->get_widget_prelight()) {
+ if (UIConfiguration::instance().get_widget_prelight()) {
CairoWidget::set_dirty ();
}
ArdourButton::action_tooltip_changed ()
{
string str = _action->property_tooltip().get_value();
- ARDOUR_UI::instance()->set_tip (*this, str);
+ set_tooltip (*this, str);
}
void
}
void
-ArdourButton::set_icon (Icon i)
+ArdourButton::set_icon (Gtkmm2ext::ArdourIcon::Icon i)
{
_icon = i;
+ _elements = (ArdourButton::Element) ((_elements | ArdourButton::VectorIcon) & ~ArdourButton::Text);
CairoWidget::set_dirty ();
}
projects / ardour.git / blobdiff