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

Disambiguate Rect(angle) -- fixes Windows and macOS builds

Browse source
This commit is contained in:
Robin Gareus 2021-12-16 23:42:33 +01:00
parent 8193d579de
commit 95aad0dc15
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/cuebox_ui.cc
View file

@ -118,7 +118,7 @@ CueEntry::event_handler (GdkEvent* ev)
void void
CueEntry::_size_allocate (ArdourCanvas::Rect const & alloc) CueEntry::_size_allocate (ArdourCanvas::Rect const & alloc)
{ {
Rectangle::_size_allocate (alloc); ArdourCanvas::Rectangle::_size_allocate (alloc);
const Distance width = _rect.width(); const Distance width = _rect.width();
const Distance height = _rect.height(); const Distance height = _rect.height();
@ -134,7 +134,7 @@ CueEntry::_size_allocate (ArdourCanvas::Rect const & alloc)
float tleft = height; //make room for the play button float tleft = height; //make room for the play button
float twidth = name_button->width() - poly_margin*2; float twidth = name_button->width() - poly_margin*2;
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->set_position (Duple (tleft + poly_margin, poly_margin -0.5));
name_text->clamp_width ( width - height ); name_text->clamp_width ( width - height );
@ -143,15 +143,15 @@ CueEntry::_size_allocate (ArdourCanvas::Rect const & alloc)
} }
void void
CueEntry::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const CueEntry::render (ArdourCanvas::Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
{ {
Rectangle::render(area, context); ArdourCanvas::Rectangle::render(area, context);
/* Note that item_to_window() already takes _position into account (as /* Note that item_to_window() already takes _position into account (as
part of item_to_canvas() part of item_to_canvas()
*/ */
Rect self (item_to_window (_rect)); ArdourCanvas::Rect self (item_to_window (_rect));
const Rect draw = self.intersection (area); const ArdourCanvas::Rect draw = self.intersection (area);
if (!draw) { if (!draw) {
return; return;
@ -251,7 +251,7 @@ Gtkmm2ext::Bindings* CueBoxUI::bindings = 0;
Glib::RefPtr<Gtk::ActionGroup> CueBoxUI::trigger_actions; Glib::RefPtr<Gtk::ActionGroup> CueBoxUI::trigger_actions;
CueBoxUI::CueBoxUI (ArdourCanvas::Item* parent) CueBoxUI::CueBoxUI (ArdourCanvas::Item* parent)
: Rectangle (parent) : ArdourCanvas::Rectangle (parent)
{ {
set_layout_sensitive(true); //why??? set_layout_sensitive(true); //why???
@ -320,7 +320,7 @@ CueBoxUI::build ()
void void
CueBoxUI::_size_allocate (ArdourCanvas::Rect const & alloc) CueBoxUI::_size_allocate (ArdourCanvas::Rect const & alloc)
{ {
Rectangle::_size_allocate (alloc); ArdourCanvas::Rectangle::_size_allocate (alloc);
const float width = alloc.width(); const float width = alloc.width();
const float height = alloc.height(); const float height = alloc.height();

2
gtk2_ardour/midi_clip_editor.cc
View file

@ -59,7 +59,7 @@ MidiClipEditor::MidiClipEditor ()
const double width = 600. * scale; const double width = 600. * scale;
const double height = 210. * scale; const double height = 210. * scale;
frame = new Rectangle (this); frame = new ArdourCanvas::Rectangle (this);
ArdourCanvas::Rect r (0, 0, width, height); ArdourCanvas::Rect r (0, 0, width, height);
frame->set (r); frame->set (r);