#include "tooltips.h"
#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
#define BASELINESTRETCH (1.25)
#define TRACKHEADERBTNW (3.10)
}
//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);
}
}
- 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));
- assert (_layout);
- _layout->get_pixel_size (_text_width, _text_height);
+ 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()) {
- req->width += rint(1.75 * char_pixel_width()); // padding
- req->width += _text_width;
+ //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 */
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 = UIConfiguration::instance().color (string_compose ("%1: fill active", name), &failed);
- if (failed) {
- fill_active_color = UIConfiguration::instance().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 = UIConfiguration::instance().color (string_compose ("%1: fill", name), &failed);
- if (failed) {
- fill_inactive_color = UIConfiguration::instance().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);
*/
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 ();
+}
+
+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.));