allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

auto-ify a loop in the canvas ruler rendering code

Browse Source
This commit is contained in:
Paul Davis
2025-09-02 11:10:11 -06:00
parent 2e33194ed5
commit 603f8a2c6b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/canvas/ruler.cc
View File

@@ -170,11 +170,11 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
Pango::FontDescription* last_font_description = nullptr; Pango::FontDescription* last_font_description = nullptr;
Coord prev = -1; Coord prev = -1;
for (vector<Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) { for (auto const & mark : marks) {
Duple pos; Duple pos;
Pango::FontDescription* fd; Pango::FontDescription* fd;
switch (m->style) { switch (mark.style) {
case Mark::Major: case Mark::Major:
fd = _font_description; fd = _font_description;
break; break;
@@ -187,7 +187,7 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
break; break;
} }
pos.x = round (m->position/_metric->units_per_pixel) + self.x0; pos.x = round (mark.position/_metric->units_per_pixel) + self.x0;
pos.y = self.y1; /* bottom edge */ pos.y = self.y1; /* bottom edge */
if (pos.x < 0) { if (pos.x < 0) {
@@ -201,10 +201,10 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
/* and the text */ /* and the text */
if (!m->label.empty()) { if (!mark.label.empty()) {
Pango::Rectangle logical; Pango::Rectangle logical;
layout->set_text (m->label); layout->set_text (mark.label);
logical = layout->get_pixel_logical_extents (); logical = layout->get_pixel_logical_extents ();
if ((prev >= 0.) && ((pos.x - prev) < (6. + logical.get_width()))) { if ((prev >= 0.) && ((pos.x - prev) < (6. + logical.get_width()))) {
@@ -228,7 +228,7 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
cr->move_to (pos.x, pos.y); cr->move_to (pos.x, pos.y);
} }
switch (m->style) { switch (mark.style) {
case Mark::Major: case Mark::Major:
if (_divide_height >= 0) { if (_divide_height >= 0) {
cr->rel_line_to (0, -_divide_height); cr->rel_line_to (0, -_divide_height);