#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"
using namespace Gtk;
using namespace Glib;
using namespace PBD;
+using namespace ARDOUR_UI_UTILS;
using std::max;
using std::min;
using namespace std;
, _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)
, _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()
/* 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:
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 ();
//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 & 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);
}
std::string name = get_name();
bool failed = false;
- fill_active_color = ARDOUR_UI::config()->color (string_compose ("%1: fill active", name), &failed);
+ fill_active_color = UIConfiguration::instance().color (string_compose ("%1: fill active", name), &failed);
if (failed) {
- fill_active_color = ARDOUR_UI::config()->color ("generic button: fill active");
+ fill_active_color = UIConfiguration::instance().color ("generic button: fill active");
}
- fill_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: fill", name), &failed);
+ fill_inactive_color = UIConfiguration::instance().color (string_compose ("%1: fill", name), &failed);
if (failed) {
- fill_inactive_color = ARDOUR_UI::config()->color ("generic button: fill");
+ 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;
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