#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 Gdk;
using namespace Gtk;
using namespace Glib;
using namespace PBD;
+using namespace ARDOUR_UI_UTILS;
using std::max;
using std::min;
using namespace std;
ArdourButton::Element ArdourButton::just_led_default_elements = ArdourButton::Element (ArdourButton::Edge|ArdourButton::Body|ArdourButton::Indicator);
ArdourButton::ArdourButton (Element e)
- : _elements (e)
+ : _sizing_text("")
+ , _markup (false)
+ , _elements (e)
+ , _icon (Gtkmm2ext::ArdourIcon::NoIcon)
+ , _icon_render_cb (0)
+ , _icon_render_cb_data (0)
, _tweaks (Tweaks (0))
, _char_pixel_width (0)
, _char_pixel_height (0)
, _text_width (0)
, _text_height (0)
, _diameter (0)
- , _corner_radius (2.5)
+ , _corner_radius (3.5)
, _corner_mask (0xf)
, _angle(0)
, _xalign(.5)
, text_inactive_color(0)
, led_active_color(0)
, led_inactive_color(0)
+ , led_custom_color (0)
+ , use_custom_led_color (false)
, convex_pattern (0)
, concave_pattern (0)
, led_inset_pattern (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));
+ /* This is not provided by gtkmm */
+ signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
}
ArdourButton::ArdourButton (const std::string& str, Element e)
- : _elements (e)
+ : _sizing_text("")
+ , _markup (false)
+ , _elements (e)
+ , _icon (Gtkmm2ext::ArdourIcon::NoIcon)
, _tweaks (Tweaks (0))
+ , _char_pixel_width (0)
+ , _char_pixel_height (0)
+ , _char_avg_pixel_width (0)
, _text_width (0)
, _text_height (0)
, _diameter (0)
- , _corner_radius (2.5)
+ , _corner_radius (3.5)
, _corner_mask (0xf)
, _angle(0)
, _xalign(.5)
, text_inactive_color(0)
, led_active_color(0)
, led_inactive_color(0)
+ , led_custom_color (0)
+ , use_custom_led_color (false)
, convex_pattern (0)
, concave_pattern (0)
, led_inset_pattern (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));
+ /* This is not provided by gtkmm */
+ signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
}
ArdourButton::~ArdourButton()
if (_layout) {
_layout->set_font_description (fd);
queue_resize ();
+ _char_pixel_width = 0;
+ _char_pixel_height = 0;
}
}
void
-ArdourButton::set_text (const std::string& str)
+ArdourButton::set_text_internal () {
+ assert (_layout);
+ if (_markup) {
+ _layout->set_markup (_text);
+ } else {
+ _layout->set_text (_text);
+ }
+}
+
+void
+ArdourButton::set_text (const std::string& str, bool markup)
{
+ if (!(_elements & Text)) {
+ return;
+ }
+ if (_text == str && _markup == markup) {
+ return;
+ }
+
_text = str;
+ _markup = markup;
if (!is_realized()) {
return;
}
ensure_layout ();
if (_layout && _layout->get_text() != _text) {
- _layout->set_text (_text);
+ set_text_internal ();
+ /* on_size_request() will fill in _text_width/height
+ * so queue it even if _sizing_text != "" */
+ queue_resize ();
+ }
+}
+
+void
+ArdourButton::set_sizing_text (const std::string& str)
+{
+ if (_sizing_text == str) {
+ return;
+ }
+ _sizing_text = str;
+ if (!is_realized()) {
+ return;
+ }
+ ensure_layout ();
+ if (_layout) {
queue_resize ();
}
}
_yalign = ya;
}
+
+/* TODO make this a dedicated function elsewhere.
+ *
+ * Option 1:
+ * virtual ArdourButton::render_vector_icon()
+ * ArdourIconButton::render_vector_icon
+ *
+ * Option 2:
+ * ARDOUR_UI_UTILS::render_vector_icon()
+ */
void
-ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
+ArdourButton::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t*)
{
+ cairo_t* cr = ctx->cobj();
+
uint32_t text_color;
uint32_t led_color;
+ const float corner_radius = std::max(2.f, _corner_radius * UIConfiguration::instance().get_ui_scale());
+
if (_update_colors) {
set_colors ();
}
led_color = led_inactive_color;
}
+ if (use_custom_led_color) {
+ led_color = led_custom_color;
+ }
+
void (*rounded_function)(cairo_t*, double, double, double, double, double);
switch (_corner_mask) {
// draw edge (filling a rect underneath, rather than stroking a border on top, allows the corners to be lighter-weight.
if ((_elements & (Body|Edge)) == (Body|Edge)) {
- rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius + 1.5);
+ rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius + 1.5);
cairo_set_source_rgba (cr, 0, 0, 0, 1);
cairo_fill(cr);
}
// background fill
if ((_elements & Body)==Body) {
- rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+ rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
if (active_state() == Gtkmm2ext::ImplicitActive && !((_elements & Indicator)==Indicator)) {
ArdourCanvas::set_source_rgba (cr, fill_inactive_color);
cairo_fill (cr);
if ((_elements & Body)==Body) {
if (active_state() == Gtkmm2ext::ImplicitActive && !((_elements & Indicator)==Indicator)) {
cairo_set_line_width (cr, 2.0);
- rounded_function (cr, 2, 2, get_width() - 4, get_height() - 4, _corner_radius-0.5);
+ rounded_function (cr, 2, 2, get_width() - 4, get_height() - 4, corner_radius-0.5);
ArdourCanvas::set_source_rgba (cr, fill_active_color);
cairo_stroke (cr);
}
}
//show the "convex" or "concave" gradient
- if (!_flat_buttons) {
- if ( active_state() == Gtkmm2ext::ExplicitActive && !((_elements & Indicator)==Indicator) ) {
+ 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);
- Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+ Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
cairo_fill (cr);
} else {
cairo_set_source (cr, convex_pattern);
- Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+ Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
cairo_fill (cr);
}
}
gdk_cairo_set_source_pixbuf (cr, _pixbuf->gobj(), x, y);
cairo_fill (cr);
}
- else // rec-en is exclusive to pixbuf (tape machine mode, rec-en)
- if ((_elements & (RecButton|RecTapeMode)) == (RecButton|RecTapeMode)) {
- const double x = get_width() * .5;
- const double y = get_height() * .5;
- const double r = std::min(10., std::min(x, y) * .6); // TODO we need a better way to limit max. radius.
- 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 (active_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 (active_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);
- }
- else if (_elements & RecButton) {
- const double x = get_width() * .5;
- const double y = get_height() * .5;
- const double r = std::min(10., std::min(x, y) * .55); // TODO we need a better way to limit max. radius.
- cairo_arc (cr, x, y, r, 0, 2 * M_PI);
- if (active_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);
- }
- else if (_elements & CloseCross) {
- const double x = get_width() * .5;
- const double y = get_height() * .5;
- const double o = .5 + std::min(x, y) * .4;
- ArdourCanvas::set_source_rgba (cr, text_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);
+ else /* VectorIcon, IconRenderCallback are exclusive to Pixbuf Icons */
+ if (_elements & (VectorIcon | IconRenderCallback)) {
+ int vw = get_width();
+ int vh = get_height();
+ if (_elements & Menu) {
+ vw -= _diameter + 4;
+ }
+ if (_elements & VectorIcon) {
+ Gtkmm2ext::ArdourIcon::render (cr, _icon, vw, vh, active_state(), text_color);
+ } else {
+ cairo_save (cr);
+ rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius + 1.5);
+ cairo_clip (cr);
+ _icon_render_cb (cr, vw, vh, text_color, _icon_render_cb_data);
+ cairo_restore (cr);
+ }
}
const int text_margin = char_pixel_width();
ww = get_width();
wh = get_height();
- cairo_save (cr);
- cairo_rotate(cr, _angle * M_PI / 180.0);
+ cairo_matrix_t m1;
+ cairo_get_matrix (cr, &m1);
+ cairo_matrix_t m2 = m1;
+ m2.x0 = 0;
+ m2.y0 = 0;
+ cairo_set_matrix (cr, &m2);
+
+ if (_angle) {
+ cairo_rotate(cr, _angle * M_PI / 180.0);
+ }
+
cairo_device_to_user(cr, &ww, &wh);
- xa = (ww - _text_width) * _xalign;
+ xa = text_margin + (ww - _text_width - 2 * text_margin) * _xalign;
ya = (wh - _text_height) * _yalign;
/* quick hack for left/bottom alignment at -90deg
*/
if (_xalign < 0) xa = ceil(.5 + (ww * fabs(_xalign) + text_margin));
- cairo_move_to (cr, xa, ya);
+ cairo_move_to (cr, xa + m1.x0, ya + m1.y0);
pango_cairo_update_layout(cr, _layout->gobj());
pango_cairo_show_layout (cr, _layout->gobj());
- cairo_restore (cr);
}
cairo_restore (cr);
}
//black ring
cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_arc (cr, 0, 0, _diameter * .5 - 1, 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, 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 gray layer to indicate insensitivity
+ // a transparent overlay to indicate insensitivity
if ((visual_state() & Gtkmm2ext::Insensitive)) {
- rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
- cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.6);
+ rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius);
+ 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::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);
+ rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.2);
cairo_fill (cr);
}
//user is currently pressing the button. dark outline helps to indicate this
if (_grabbed && !(_elements & (Inactive|Menu))) {
- rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+ rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
cairo_set_line_width(cr, 2);
cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, .5);
cairo_stroke (cr);
if (visual_state() & Gtkmm2ext::Selected) {
cairo_set_line_width(cr, 1);
cairo_set_source_rgba (cr, 1, 0, 0, 0.8);
- rounded_function (cr, 0.5, 0.5, get_width() - 1, get_height() - 1, _corner_radius);
+ rounded_function (cr, 0.5, 0.5, get_width() - 1, get_height() - 1, corner_radius);
cairo_stroke (cr);
}
// (the editor is always the first receiver for KeyDown).
// It's needed for eg. the engine-dialog at startup or after closing a sesion.
if (_focused) {
- rounded_function (cr, 1.5, 1.5, get_width() - 3, get_height() - 3, _corner_radius);
+ rounded_function (cr, 1.5, 1.5, get_width() - 3, get_height() - 3, corner_radius);
cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.8);
double dashes = 1;
cairo_set_dash (cr, &dashes, 1, 0);
{
CairoWidget::on_realize ();
ensure_layout ();
- if (_layout && _layout->get_text() != _text) {
- _layout->set_text (_text);
- queue_resize ();
+ if (_layout) {
+ if (_layout->get_text() != _text) {
+ set_text_internal ();
+ queue_resize ();
+ }
}
}
CairoWidget::on_size_request (req);
if (_diameter == 0) {
- const float newdia = rint (ARDOUR::Config->get_font_scale () / 1024. / 7.5); // 11px with 80% font-scaling
+ 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));
+ if (_elements & Text) {
+
+ ensure_layout();
+ set_text_internal ();
+
+ /* render() needs the size of the displayed text */
_layout->get_pixel_size (_text_width, _text_height);
- req->width += rint(1.75 * char_pixel_width()); // padding
- req->width += _text_width;
+
+ if (_tweaks & OccasionalText) {
+
+ /* size should not change based on presence or absence
+ * of text.
+ */
+
+ } else /*if (!_text.empty() || !_sizing_text.empty()) */ {
+
+ req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0));
+ req->width += rint(1.75 * char_pixel_width()); // padding
+
+ if (!_sizing_text.empty()) {
+ _layout->set_text (_sizing_text); /* use sizing text */
+ }
+
+ int sizing_text_width = 0, sizing_text_height = 0;
+ _layout->get_pixel_size (sizing_text_width, sizing_text_height);
+
+ req->width += sizing_text_width;
+
+ if (!_sizing_text.empty()) {
+ set_text_internal (); /* restore display text */
+ }
+ }
+
+ /* 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;
req->width += _diameter + 4;
}
- if (_elements & (RecButton | CloseCross)) {
+ if (_elements & (VectorIcon | IconRenderCallback)) {
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);
}
req->width = req->height;
if (req->height < req->width)
req->height = req->width;
- } else if (_text_width > 0 && !(_elements & (Menu | Indicator))) {
+ } else if (_sizing_text.empty() && _text_width > 0 && !(_elements & Menu)) {
// properly centered text for those elements that are centered
// (no sub-pixel offset)
if ((req->width - _text_width) & 1) { ++req->width; }
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);
- if (failed) {
- led_active_color = ARDOUR_UI::config()->color ("generic button: led active");
- }
- led_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: led", name), &failed);
+ led_active_color = UIConfiguration::instance().color (string_compose ("%1: led active", name), &failed);
if (failed) {
- led_inactive_color = ARDOUR_UI::config()->color ("generic button: led");
+ 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;
+
+ led_inactive_color = inactive.color ();
}
/**
*/
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);
+}
- fill_active_color = color_active;
- fill_inactive_color = color_inactive;
+void ArdourButton::set_active_color (const uint32_t color)
+{
+ _fixed_colors_set |= 0x1;
+
+ 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 ();
+}
- UINT_TO_RGBA(color_inactive, &r, &g, &b, &a);
+void ArdourButton::set_inactive_color (const uint32_t color)
+{
+ _fixed_colors_set |= 0x2;
- white_contrast = (max (double(r), 255.) - min (double(r), 255.)) +
+ fill_inactive_color = color;
+
+ 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 ((_elements & Indicator) && _led_rect && _distinct_led_click) {
+ 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 &&
ev->y >= _led_rect->y && ev->y < _led_rect->y + _led_rect->height) {
return true;
_grabbed = true;
CairoWidget::set_dirty ();
- if (!_act_on_release) {
+ if (ev->button == 1 && !_act_on_release) {
if (_action) {
_action->activate ();
return true;
bool
ArdourButton::on_button_release_event (GdkEventButton *ev)
{
- if (_hovering && (_elements & Indicator) && _led_rect && _distinct_led_click) {
+ 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;
}
}
_grabbed = false;
CairoWidget::set_dirty ();
- if (_hovering) {
+ if (ev->button == 1 && _hovering) {
signal_clicked ();
if (_act_on_release) {
if (_action) {
{
_update_colors = true;
CairoWidget::set_dirty ();
+ _char_pixel_width = 0;
+ _char_pixel_height = 0;
+ if (is_realized()) {
+ queue_resize ();
+ }
}
void
void
ArdourButton::set_image (const RefPtr<Gdk::Pixbuf>& img)
{
+ _elements = (ArdourButton::Element) (_elements & ~ArdourButton::Text);
_pixbuf = img;
if (is_realized()) {
queue_resize ();
bool
ArdourButton::on_key_release_event (GdkEventKey *ev) {
- if (_focused &&
+ if (_act_on_release && _focused &&
+ (ev->keyval == GDK_space || ev->keyval == GDK_Return))
+ {
+ signal_clicked();
+ if (_action) {
+ _action->activate ();
+ }
+ return true;
+ }
+ return CairoWidget::on_key_release_event (ev);
+}
+
+bool
+ArdourButton::on_key_press_event (GdkEventKey *ev) {
+ if (!_act_on_release && _focused &&
(ev->keyval == GDK_space || ev->keyval == GDK_Return))
{
signal_clicked();
{
_hovering = (_elements & Inactive) ? false : true;
- if (ARDOUR::Config->get_widget_prelight()) {
+ if (UIConfiguration::instance().get_widget_prelight()) {
CairoWidget::set_dirty ();
}
{
_hovering = false;
- if (ARDOUR::Config->get_widget_prelight()) {
+ if (UIConfiguration::instance().get_widget_prelight()) {
CairoWidget::set_dirty ();
}
return CairoWidget::on_leave_notify_event (ev);
}
+bool
+ArdourButton::on_grab_broken_event(GdkEventGrabBroken* grab_broken_event) {
+ /* Our implicit grab due to a button_press was broken by another grab:
+ * the button will not get any button_release event if the mouse leaves
+ * while the grab is taken, so unpress ourselves */
+ _grabbed = false;
+ CairoWidget::set_dirty ();
+ return true;
+}
+
void
ArdourButton::set_tweaks (Tweaks t)
{
}
void
-ArdourButton::set_layout_ellisize_width (int w)
+ArdourButton::set_layout_ellipsize_width (int w)
{
if (_layout_ellipsize_width == w) {
return;
if (!_layout) {
return;
}
- if (_layout_ellipsize_width > 0) {
- _layout->set_width (_layout_ellipsize_width);
+ if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
+ _layout->set_width (_layout_ellipsize_width - 3 * PANGO_SCALE);
+ }
+ if (is_realized ()) {
+ queue_resize ();
}
}
return;
}
_layout->set_ellipsize(_ellipsis);
- if (_layout_ellipsize_width > 0) {
- _layout->set_width (_layout_ellipsize_width);
+ if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
+ _layout->set_width (_layout_ellipsize_width - 3 * PANGO_SCALE);
}
if (is_realized ()) {
queue_resize ();
ensure_style ();
_layout = Pango::Layout::create (get_pango_context());
_layout->set_ellipsize(_ellipsis);
- if (_layout_ellipsize_width > 0) {
- _layout->set_width (_layout_ellipsize_width);
+ if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
+ _layout->set_width (_layout_ellipsize_width - 3* PANGO_SCALE);
}
}
}
// NB. this is not static, since the geometry is different
// depending on the font used.
int w, h;
- std::string x = _("ABCDEFGHIJLKMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+ std::string x = _("@ABCDEFGHIJLKMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
_layout->set_text (x);
_layout->get_pixel_size (w, h);
_char_pixel_height = std::max(4, h);
Glib::ustring gx(x);
_char_avg_pixel_width = w / (float)gx.size();
_char_pixel_width = std::max(4, (int) ceil (_char_avg_pixel_width));
- _layout->set_text (_text);
+ set_text_internal (); /* restore display text */
}
void
ArdourButton::action_tooltip_changed ()
{
string str = _action->property_tooltip().get_value();
- ARDOUR_UI::instance()->set_tip (*this, str);
+ set_tooltip (*this, str);
}
void
_elements = (ArdourButton::Element) (_elements | e);
CairoWidget::set_dirty ();
}
+
+void
+ArdourButton::set_icon (Gtkmm2ext::ArdourIcon::Icon i)
+{
+ _icon = i;
+ _icon_render_cb = 0;
+ _icon_render_cb_data = 0;
+ _elements = (ArdourButton::Element) ((_elements | VectorIcon) & ~(ArdourButton::Text | IconRenderCallback));
+ CairoWidget::set_dirty ();
+}
+
+void
+ArdourButton::set_icon (rendercallback_t cb, void* d)
+{
+ if (!cb) {
+ _elements = (ArdourButton::Element) ((_elements | ArdourButton::Text) & ~(IconRenderCallback | VectorIcon));
+ _icon_render_cb = 0;
+ _icon_render_cb_data = 0;
+ } else {
+ _elements = (ArdourButton::Element) ((_elements | IconRenderCallback) & ~(ArdourButton::Text | VectorIcon));
+ _icon_render_cb = cb;
+ _icon_render_cb_data = d;
+ }
+ CairoWidget::set_dirty ();
+}
+
+void
+ArdourButton::set_custom_led_color (uint32_t c, bool useit)
+{
+ if (led_custom_color == c && use_custom_led_color == useit) {
+ return;
+ }
+
+ led_custom_color = c;
+ use_custom_led_color = useit;
+ CairoWidget::set_dirty ();
+}