smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

trigger_ui: pixel-pushing: remove drop-shadows and try circles for Cues

Browse source
This commit is contained in:
Ben Loftis 2022-01-18 15:52:54 -06:00
parent 267229c03c
commit ddd5b26686
5 changed files with 49 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

102
gtk2_ardour/cuebox_ui.cc
View file

@ -23,6 +23,7 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/triggerbox.h" #include "ardour/triggerbox.h"
#include "canvas/circle.h"
#include "canvas/polygon.h" #include "canvas/polygon.h"
#include "canvas/text.h" #include "canvas/text.h"
@ -63,17 +64,7 @@ CueEntry::CueEntry (Item* item, uint64_t cue_index)
set_outline (false); set_outline (false);
set_fill_color (UIConfiguration::instance ().color ("theme:bg")); set_fill_color (UIConfiguration::instance ().color ("theme:bg"));
play_button = new ArdourCanvas::Rectangle (this); name_button = new ArdourCanvas::Circle (this);
play_button->set_outline (false);
play_button->set_fill (true);
play_button->name = string_compose ("playbutton %1", _cue_idx);
play_button->show ();
play_shape = new ArdourCanvas::Polygon (play_button);
play_shape->name = string_compose ("playshape %1", _cue_idx);
play_shape->show ();
name_button = new ArdourCanvas::Rectangle (this);
name_button->set_outline (false); name_button->set_outline (false);
name_button->set_fill (true); name_button->set_fill (true);
name_button->name = ("slot_selector_button"); name_button->name = ("slot_selector_button");
@ -81,7 +72,6 @@ CueEntry::CueEntry (Item* item, uint64_t cue_index)
name_text = new Text (name_button); name_text = new Text (name_button);
name_text->set (string_compose ("%1", (char)('A' + _cue_idx))); // XXX not translatable name_text->set (string_compose ("%1", (char)('A' + _cue_idx))); // XXX not translatable
name_text->set_ignore_events (false); name_text->set_ignore_events (false);
name_text->show (); name_text->show ();
@ -102,10 +92,7 @@ CueEntry::event_handler (GdkEvent* ev)
break; break;
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) { if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) {
name_text->set_color (UIConfiguration::instance ().color ("neutral:foregroundest")); // name_button->set_fill_color (UIConfiguration::instance ().color ("neutral:foregroundest"));
play_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foregroundest"));
play_button->set_fill_color (HSV (fill_color ()).lighter (0.15).color ());
name_button->set_fill_color (HSV (fill_color ()).lighter (0.15).color ());
set_fill_color (HSV (fill_color ()).lighter (0.15).color ()); set_fill_color (HSV (fill_color ()).lighter (0.15).color ());
} }
break; break;
@ -129,23 +116,17 @@ CueEntry::_size_allocate (ArdourCanvas::Rect const& alloc)
const Distance width = _rect.width (); const Distance width = _rect.width ();
const Distance height = _rect.height (); const Distance height = _rect.height ();
play_button->set (ArdourCanvas::Rect (0, 0, height, height));
name_button->set (ArdourCanvas::Rect (height, 0, width, height));
const double scale = UIConfiguration::instance ().get_ui_scale (); const double scale = UIConfiguration::instance ().get_ui_scale ();
_poly_margin = 2. * scale;
_poly_size = height - 2 * _poly_margin;
shape_play_button ();
float tleft = height; // make room for the play button name_button->set_center ( Duple(height/2, height/2) );
float twidth = name_button->width () - _poly_margin * 2; name_button->set_radius ( (height/2)- 2*scale );
name_text->size_allocate (ArdourCanvas::Rect (0, 0, width, height)); name_text->size_allocate (ArdourCanvas::Rect (0, 0, height, height));
name_text->set_position (Duple (tleft + _poly_margin, _poly_margin - 0.5)); name_text->set_position (Duple (4. * scale, 2.5 * scale));
name_text->clamp_width (width - height); name_text->clamp_width (width - height);
/* font scale may have changed. uiconfig 'embeds' the ui-scale in the font */ /* font scale may have changed. uiconfig 'embeds' the ui-scale in the font */
name_text->set_font_description (UIConfiguration::instance ().get_NormalFont ()); name_text->set_font_description (UIConfiguration::instance ().get_SmallBoldMonospaceFont ());
} }
void void
@ -164,7 +145,7 @@ CueEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Context>
} }
float width = _rect.width (); float width = _rect.width ();
float height = _rect.height (); float height = _rect.height ();
const double scale = UIConfiguration::instance ().get_ui_scale (); const double scale = UIConfiguration::instance ().get_ui_scale ();
@ -176,7 +157,26 @@ CueEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Context>
render_children (area, context); render_children (area, context);
if (_cue_idx == 0) { { //Play triangle, needs to match TriggerEntry buttons exactly
context->set_line_width (1 * scale);
float margin = 4 * scale;
float size = height - 2 * margin;
context->set_identity_matrix ();
context->translate (self.x0, self.y0 - 0.5);
context->move_to (height + margin, margin);
context->rel_line_to (0, size);
context->rel_line_to (size, -size / 2);
context->close_path ();
set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground"));
context->stroke ();
context->set_identity_matrix ();
context->set_line_width (1);
}
if (false /*_cue_idx == 0*/) {
Cairo::RefPtr<Cairo::LinearGradient> drop_shadow_pattern = Cairo::LinearGradient::create (0.0, 0.0, 0.0, 6 * scale); Cairo::RefPtr<Cairo::LinearGradient> drop_shadow_pattern = Cairo::LinearGradient::create (0.0, 0.0, 0.0, 6 * scale);
drop_shadow_pattern->add_color_stop_rgba (0, 0, 0, 0, 0.7); drop_shadow_pattern->add_color_stop_rgba (0, 0, 0, 0, 0.7);
drop_shadow_pattern->add_color_stop_rgba (1, 0, 0, 0, 0.0); drop_shadow_pattern->add_color_stop_rgba (1, 0, 0, 0, 0.0);
@ -186,47 +186,19 @@ CueEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Context>
} }
} }
void
CueEntry::shape_play_button ()
{
Points p;
p.push_back (Duple (_poly_margin, _poly_margin));
p.push_back (Duple (_poly_margin, _poly_size));
p.push_back (Duple (_poly_size, 0.5 + _poly_size / 2.));
play_shape->set (p);
if (false /*TODO*/) {
play_shape->set_outline (false);
play_shape->set_fill (true);
} else {
play_shape->set_outline (true);
play_shape->set_fill (false);
}
}
void void
CueEntry::set_default_colors () CueEntry::set_default_colors ()
{ {
set_fill_color (UIConfiguration::instance ().color ("theme:bg")); color_t bg_col = UIConfiguration::instance ().color ("theme:bg");
play_button->set_fill_color (UIConfiguration::instance ().color ("theme:bg"));
play_button->set_outline_color (UIConfiguration::instance ().color ("theme:bg"));
name_button->set_fill_color (UIConfiguration::instance ().color ("theme:bg"));
name_text->set_fill_color (UIConfiguration::instance ().color ("theme:bg"));
//alternating darker bands
if ((_cue_idx / 2) % 2 == 0) { if ((_cue_idx / 2) % 2 == 0) {
set_fill_color (HSV (fill_color ()).darker (0.15).color ()); bg_col = HSV (bg_col).darker (0.25).color ();
play_button->set_fill_color (HSV (fill_color ()).darker (0.15).color ());
play_button->set_outline_color (HSV (fill_color ()).darker (0.15).color ());
name_button->set_fill_color (HSV (fill_color ()).darker (0.15).color ());
name_text->set_fill_color (HSV (fill_color ()).darker (0.15).color ());
} }
name_text->set_color (UIConfiguration::instance ().color ("neutral:foreground")); set_fill_color (bg_col);
name_button->set_fill_color (UIConfiguration::instance ().color ("neutral:midground"));
play_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foreground")); name_text->set_color (UIConfiguration::instance ().color ("neutral:background"));
play_shape->set_fill_color (UIConfiguration::instance ().color ("neutral:foreground"));
} }
void void
@ -317,9 +289,6 @@ CueBoxUI::context_menu (uint64_t idx)
b = BBT_Offset (-1, 0, 0); b = BBT_Offset (-1, 0, 0);
qitems.push_back (MenuElem (TriggerUI::quantize_length_to_string (b), sigc::bind (sigc::mem_fun (*this, &CueBoxUI::set_all_quantization), b, idx))); qitems.push_back (MenuElem (TriggerUI::quantize_length_to_string (b), sigc::bind (sigc::mem_fun (*this, &CueBoxUI::set_all_quantization), b, idx)));
Menu* load_menu = manage (new Menu);
MenuList& loitems (load_menu->items ());
items.push_back (MenuElem (_("Set All Follow Actions..."), *follow_menu)); items.push_back (MenuElem (_("Set All Follow Actions..."), *follow_menu));
items.push_back (MenuElem (_("Set All Launch Styles..."), *launch_menu)); items.push_back (MenuElem (_("Set All Launch Styles..."), *launch_menu));
items.push_back (MenuElem (_("Set All Quantizations..."), *quant_menu)); items.push_back (MenuElem (_("Set All Quantizations..."), *quant_menu));
@ -463,7 +432,6 @@ CueBoxUI::build ()
_slots.push_back (te); _slots.push_back (te);
#if 0 #if 0
te->play_button->Event.connect (sigc::bind (sigc::mem_fun (*this, &CueBoxUI::trigger_scene), n));
te->name_text->Event.connect (sigc::bind (sigc::mem_fun (*this, &CueBoxUI::text_event), n)); te->name_text->Event.connect (sigc::bind (sigc::mem_fun (*this, &CueBoxUI::text_event), n));
#endif #endif
te->Event.connect (sigc::bind (sigc::mem_fun (*this, &CueBoxUI::event), n)); te->Event.connect (sigc::bind (sigc::mem_fun (*this, &CueBoxUI::event), n));

6
gtk2_ardour/cuebox_ui.h
View file

@ -38,6 +38,7 @@ namespace ArdourCanvas
{ {
class Text; class Text;
class Polygon; class Polygon;
class Circle;
} }
class CueEntry : public ArdourCanvas::Rectangle class CueEntry : public ArdourCanvas::Rectangle
@ -46,10 +47,7 @@ public:
CueEntry (ArdourCanvas::Item* item, uint64_t cue_index); CueEntry (ArdourCanvas::Item* item, uint64_t cue_index);
~CueEntry (); ~CueEntry ();
ArdourCanvas::Rectangle* play_button; ArdourCanvas::Circle* name_button;
ArdourCanvas::Polygon* play_shape;
ArdourCanvas::Rectangle* name_button;
ArdourCanvas::Text* name_text; ArdourCanvas::Text* name_text;
void render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Context> context) const; void render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Context> context) const;

42
gtk2_ardour/trigger_master.cc
View file

@ -192,13 +192,6 @@ TriggerMaster::TriggerMaster (Item* parent)
Event.connect (sigc::mem_fun (*this, &TriggerMaster::event_handler)); Event.connect (sigc::mem_fun (*this, &TriggerMaster::event_handler));
stop_shape = new ArdourCanvas::Polygon (this);
stop_shape->set_outline (true);
stop_shape->set_fill (false);
stop_shape->name = X_("stopbutton");
stop_shape->set_ignore_events (true);
stop_shape->show ();
name_text = new Text (this); name_text = new Text (this);
name_text->set (""); name_text->set ("");
name_text->set_ignore_events (false); name_text->set_ignore_events (false);
@ -309,7 +302,6 @@ TriggerMaster::event_handler (GdkEvent* ev)
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) { if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) {
name_text->set_color (UIConfiguration::instance ().color ("neutral:foregroundest")); name_text->set_color (UIConfiguration::instance ().color ("neutral:foregroundest"));
stop_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:midground"));
set_fill_color (HSV (fill_color ()).lighter (0.15).color ()); set_fill_color (HSV (fill_color ()).lighter (0.15).color ());
} }
redraw (); redraw ();
@ -501,12 +493,6 @@ TriggerMaster::_size_allocate (ArdourCanvas::Rect const& alloc)
_poly_size = height - (_poly_margin * 2); _poly_size = height - (_poly_margin * 2);
Points p;
p.push_back (Duple (_poly_margin, _poly_size));
p.push_back (Duple (_poly_size, _poly_size));
p.push_back (Duple (0.5 + _poly_size / 2, _poly_margin ));
stop_shape->set (p);
float tleft = _poly_size + (_poly_margin * 3); float tleft = _poly_size + (_poly_margin * 3);
float twidth = width - _poly_size - (_poly_margin * 3); float twidth = width - _poly_size - (_poly_margin * 3);
@ -537,7 +523,6 @@ TriggerMaster::prop_change (PropertyChange const& change)
if (!trigger) { if (!trigger) {
name_text->set (text); name_text->set (text);
_loopster->hide (); _loopster->hide ();
stop_shape->show ();
return; return;
} }
@ -553,19 +538,16 @@ TriggerMaster::prop_change (PropertyChange const& change)
double f = trigger->position_as_fraction (); double f = trigger->position_as_fraction ();
_loopster->set_fraction (f); _loopster->set_fraction (f);
_loopster->show (); _loopster->show ();
stop_shape->hide ();
} else { } else {
_loopster->hide (); _loopster->hide ();
stop_shape->show ();
} }
} }
void void
TriggerMaster::set_default_colors () TriggerMaster::set_default_colors ()
{ {
set_fill_color (HSV (UIConfiguration::instance ().color ("theme:bg")).darker (0.25).color ()); set_fill_color (HSV (UIConfiguration::instance ().color ("theme:bg")).darker (0.5).color ());
name_text->set_color (UIConfiguration::instance ().color ("neutral:foreground")); name_text->set_color (UIConfiguration::instance ().color ("neutral:foreground"));
stop_shape->set_outline_color (fill_color());
} }
void void
@ -588,15 +570,11 @@ CueMaster::CueMaster (Item* parent)
stop_shape = new ArdourCanvas::Polygon (this); stop_shape = new ArdourCanvas::Polygon (this);
stop_shape->set_outline (true); stop_shape->set_outline (true);
stop_shape->set_fill (false); stop_shape->set_fill (true);
stop_shape->name = X_("stopbutton"); stop_shape->name = X_("stopbutton");
stop_shape->set_ignore_events (true); stop_shape->set_ignore_events (true);
stop_shape->show (); stop_shape->show ();
name_text = new Text (this);
name_text->set ("");
name_text->set_ignore_events (false);
/* prefs (theme colors) */ /* prefs (theme colors) */
UIConfiguration::instance ().ParameterChanged.connect (sigc::mem_fun (*this, &CueMaster::ui_parameter_changed)); UIConfiguration::instance ().ParameterChanged.connect (sigc::mem_fun (*this, &CueMaster::ui_parameter_changed));
set_default_colors (); set_default_colors ();
@ -666,9 +644,9 @@ CueMaster::event_handler (GdkEvent* ev)
break; break;
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) { if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) {
name_text->set_color (UIConfiguration::instance ().color ("neutral:foregroundest"));
stop_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foreground")); stop_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foreground"));
set_fill_color (HSV (fill_color ()).lighter (0.15).color ()); stop_shape->set_fill_color (UIConfiguration::instance ().color ("neutral:foreground"));
set_fill_color (HSV (fill_color ()).lighter (0.25).color ());
} }
break; break;
case GDK_LEAVE_NOTIFY: case GDK_LEAVE_NOTIFY:
@ -710,22 +688,14 @@ CueMaster::_size_allocate (ArdourCanvas::Rect const& alloc)
float tleft = _poly_size + (_poly_margin * 3); float tleft = _poly_size + (_poly_margin * 3);
float twidth = width - _poly_size - (_poly_margin * 3); float twidth = width - _poly_size - (_poly_margin * 3);
ArdourCanvas::Rect text_alloc (tleft, 0, twidth, height); // testing
name_text->size_allocate (text_alloc);
name_text->set_position (Duple (tleft, 1. * scale));
name_text->clamp_width (twidth);
/* font scale may have changed. uiconfig 'embeds' the ui-scale in the font */
name_text->set_font_description (UIConfiguration::instance ().get_NormalFont ());
} }
void void
CueMaster::set_default_colors () CueMaster::set_default_colors ()
{ {
set_fill_color (HSV (UIConfiguration::instance ().color ("theme:bg")).darker (0.25).color ()); set_fill_color (HSV (UIConfiguration::instance ().color ("theme:bg")).darker (0.5).color ());
name_text->set_color (UIConfiguration::instance ().color ("neutral:foreground"));
stop_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foreground")); stop_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foreground"));
stop_shape->set_fill_color (fill_color());
} }
void void

2
gtk2_ardour/trigger_master.h
View file

@ -74,7 +74,6 @@ public:
void _size_allocate (ArdourCanvas::Rect const&); void _size_allocate (ArdourCanvas::Rect const&);
ArdourCanvas::Text* name_text; ArdourCanvas::Text* name_text;
ArdourCanvas::Polygon* stop_shape;
void toggle_thru (); void toggle_thru ();
void maybe_update (); void maybe_update ();
@ -126,7 +125,6 @@ public:
void _size_allocate (ArdourCanvas::Rect const& alloc); void _size_allocate (ArdourCanvas::Rect const& alloc);
ArdourCanvas::Polygon* stop_shape; ArdourCanvas::Polygon* stop_shape;
ArdourCanvas::Text* name_text;
void maybe_update (); void maybe_update ();
bool event_handler (GdkEvent*); bool event_handler (GdkEvent*);

10
gtk2_ardour/triggerbox_ui.cc
View file

@ -166,9 +166,11 @@ TriggerEntry::_size_allocate (ArdourCanvas::Rect const& alloc)
_poly_margin = 2. * scale; _poly_margin = 2. * scale;
_poly_size = height - 2 * _poly_margin; _poly_size = height - 2 * _poly_margin;
name_text->size_allocate (ArdourCanvas::Rect (0, 0, width, height - _poly_margin * 2)); float font_margin = 2. * scale;
name_text->size_allocate (ArdourCanvas::Rect (0, 0, width, height - font_margin * 2));
float tleft = height; // make room for the play button float tleft = height; // make room for the play button
name_text->set_position (Duple (tleft + _poly_margin, _poly_margin)); // @paul why do we need tleft here? isn't name_text a child of name_button? name_text->set_position (Duple (tleft + _poly_margin, font_margin)); // @paul why do we need tleft here? isn't name_text a child of name_button?
name_text->clamp_width (width - height * 2 - _poly_margin * 3); name_text->clamp_width (width - height * 2 - _poly_margin * 3);
/* font scale may have changed. uiconfig 'embeds' the ui-scale in the font */ /* font scale may have changed. uiconfig 'embeds' the ui-scale in the font */
@ -471,7 +473,7 @@ TriggerEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Conte
context->set_identity_matrix (); context->set_identity_matrix ();
} }
if (tref.slot == 1) { if (false /*tref.slot == 1*/) {
/* drop-shadow at top */ /* drop-shadow at top */
Cairo::RefPtr<Cairo::LinearGradient> drop_shadow_pattern = Cairo::LinearGradient::create (0.0, 0.0, 0.0, 6 * scale); Cairo::RefPtr<Cairo::LinearGradient> drop_shadow_pattern = Cairo::LinearGradient::create (0.0, 0.0, 0.0, 6 * scale);
drop_shadow_pattern->add_color_stop_rgba (0, 0, 0, 0, 0.7); drop_shadow_pattern->add_color_stop_rgba (0, 0, 0, 0, 0.7);
@ -536,7 +538,7 @@ TriggerEntry::set_widget_colors (TriggerEntry::EnteredState es)
//alternating darker bands //alternating darker bands
if ((tref.slot / 2) % 2 == 0) { if ((tref.slot / 2) % 2 == 0) {
bg_col = HSV (bg_col).darker (0.15).color (); bg_col = HSV (bg_col).darker (0.25).color ();
} }
set_fill_color (bg_col); set_fill_color (bg_col);