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

triggerbox gui: replace stop-button with Loopster progress-indicator

Browse source
This commit is contained in:
Ben Loftis 2021-12-16 08:15:19 -06:00
parent f8432d0647
commit 9593cb97d1
2 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gtk2_ardour/trigger_master.cc
View file

@ -129,15 +129,6 @@ TriggerMaster::TriggerMaster (Item* parent, boost::shared_ptr<TriggerBox> t)
Event.connect (sigc::mem_fun (*this, &TriggerMaster::event_handler)); Event.connect (sigc::mem_fun (*this, &TriggerMaster::event_handler));
active_bar = new ArdourCanvas::Rectangle (this);
active_bar->set_outline (false);
stop_shape = new ArdourCanvas::Polygon (this);
stop_shape->set_outline (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);
@ -238,7 +229,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_fill_color (UIConfiguration::instance().color("neutral:foregroundest"));
set_fill_color (HSV (fill_color()).lighter(0.15).color ()); set_fill_color (HSV (fill_color()).lighter(0.15).color ());
} }
redraw (); redraw ();
@ -374,13 +364,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_margin));
p.push_back (Duple (poly_margin, poly_size));
p.push_back (Duple (poly_size, poly_size));
p.push_back (Duple (poly_size, 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);
@ -389,7 +372,7 @@ TriggerMaster::_size_allocate (ArdourCanvas::Rect const & alloc)
name_text->set_position (Duple (tleft, 1.*scale)); name_text->set_position (Duple (tleft, 1.*scale));
name_text->clamp_width (twidth); name_text->clamp_width (twidth);
_loopster->set(ArdourCanvas::Rect(width-height, 0, width, height)); _loopster->set(ArdourCanvas::Rect(0, 0, height, 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_NormalFont());
@ -429,7 +412,6 @@ 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.25).color ());
name_text->set_color (UIConfiguration::instance().color("neutral:foreground")); name_text->set_color (UIConfiguration::instance().color("neutral:foreground"));
stop_shape->set_fill_color (UIConfiguration::instance().color("neutral:foreground"));
} }

2
gtk2_ardour/trigger_master.h
View file

@ -67,8 +67,6 @@ class TriggerMaster : public ArdourCanvas::Rectangle
void _size_allocate (ArdourCanvas::Rect const & alloc); void _size_allocate (ArdourCanvas::Rect const & alloc);
ArdourCanvas::Rectangle* active_bar;
ArdourCanvas::Polygon* stop_shape;
ArdourCanvas::Text* name_text; ArdourCanvas::Text* name_text;
void maybe_update (); void maybe_update ();