From a9e1a8a885373f4a65022557975d2ac9d4cbe648 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 13 Dec 2021 12:02:57 -0700 Subject: [PATCH] fix compilation on macOS (usual conflicts over "Rect" typename) --- gtk2_ardour/triggerbox_ui.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index 6c86c9e820..3059263564 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -149,7 +149,7 @@ TriggerEntry::_size_allocate (ArdourCanvas::Rect const & alloc) float tleft = height; //make room for the play button - name_text->size_allocate (Rect(0, 0, width, height)); + name_text->size_allocate (ArdourCanvas::Rect(0, 0, width, height)); name_text->set_position (Duple (tleft + poly_margin, poly_margin -0.5)); name_text->clamp_width ( width - height ); @@ -158,7 +158,7 @@ TriggerEntry::_size_allocate (ArdourCanvas::Rect const & alloc) } void -TriggerEntry::render (Rect const & area, Cairo::RefPtr context) const +TriggerEntry::render (ArdourCanvas::Rect const & area, Cairo::RefPtr context) const { Rectangle::render(area, context); @@ -410,7 +410,7 @@ TriggerBoxUI::_size_allocate (ArdourCanvas::Rect const & alloc) float ypos = 0; for (auto & slot : _slots) { - slot->size_allocate (Rect(0, 0, width, slot_h)); + slot->size_allocate (ArdourCanvas::Rect(0, 0, width, slot_h)); slot->set_position (Duple (0, ypos)); ypos += slot_h; slot->show();