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

triggerbox (UI): various small changes in GUI (stop buttons, mostly)

Browse source
This commit is contained in:
Paul Davis 2021-08-06 21:27:38 -06:00
parent 7458f47bb7
commit d8d9ffaf3d
1 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

45
gtk2_ardour/triggerbox_ui.cc
View file

@ -62,13 +62,6 @@ TriggerEntry::TriggerEntry (Canvas* canvas, ARDOUR::Trigger& t)
play_button = new Polygon (this); play_button = new Polygon (this);
Points p;
const double triangle_size = height - (8. * scale);
p.push_back (Duple (0., 0.));
p.push_back (Duple (0., triangle_size));
p.push_back (Duple (triangle_size, triangle_size / 2.));
play_button->set (p);
play_button->set_fill_color (Gtkmm2ext::random_color()); play_button->set_fill_color (Gtkmm2ext::random_color());
play_button->set_outline (false); play_button->set_outline (false);
@ -92,12 +85,34 @@ TriggerEntry::~TriggerEntry ()
void void
TriggerEntry::prop_change (PropertyChange const & change) TriggerEntry::prop_change (PropertyChange const & change)
{ {
const double scale = UIConfiguration::instance().get_ui_scale();
if (change.contains (ARDOUR::Properties::name)) { if (change.contains (ARDOUR::Properties::name)) {
if (_trigger.region()) { if (_trigger.region()) {
name_text->set (short_version (_trigger.region()->name(), 20)); name_text->set (short_version (_trigger.region()->name(), 20));
Points p;
const double triangle_size = height() - (8. * scale);
p.push_back (Duple (0., 0.));
p.push_back (Duple (0., triangle_size));
p.push_back (Duple (triangle_size, triangle_size / 2.));
play_button->set (p);
} else { } else {
/* we need some spaces to have something to click on */ /* we need some spaces to have something to click on */
name_text->set (X_(" ")); name_text->set (X_(" "));
Points p;
const double square_size = height() - (8. * scale);
p.push_back (Duple (0., 0.));
p.push_back (Duple (0., square_size));
p.push_back (Duple (square_size, square_size));
p.push_back (Duple (square_size, 0));
play_button->set (p);
} }
} }
} }
@ -185,6 +200,21 @@ TriggerBoxUI::event (GdkEvent* ev, size_t n)
bool bool
TriggerBoxUI::bang (GdkEvent *ev, size_t n) TriggerBoxUI::bang (GdkEvent *ev, size_t n)
{ {
if (!_triggerbox.trigger (n)->region()) {
/* this is a stop button */
switch (ev->type) {
case GDK_BUTTON_PRESS:
if (ev->button.button == 1) {
_triggerbox.stop_all ();
return true;
}
default:
break;
}
return false;
}
switch (ev->type) { switch (ev->type) {
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
switch (ev->button.button) { switch (ev->button.button) {
@ -383,6 +413,7 @@ TriggerBoxUI::sample_chosen (int response, size_t n)
std::string path = file_chooser->get_filename (); std::string path = file_chooser->get_filename ();
_triggerbox.set_from_path (n, path); _triggerbox.set_from_path (n, path);
// _triggerbox.trigger (n)->set_length (timecnt_t (Temporal::Beats (4, 0)));
} }
/* ------------ */ /* ------------ */