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

fix LineSet arithmetic (again!) and reduce redundancy

Browse Source 
The logic for "is-integral" was backwards, and the code in both
branches of the conditional was identical
This commit is contained in:
Paul Davis
2025-06-03 17:09:29 -06:00
parent 024dedc446
commit 959e360dd0
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libs/canvas/line_set.cc
View File

@@ -137,29 +137,21 @@ LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
void
LineSet::add_coord (Coord pos, Distance width, Gtkmm2ext::Color color)
{
_lines.push_back (Line (pos, width, color));
Line& l (_lines.back());
if (_orientation == Horizontal) {
/* If width is odd (width % 2 != 0) and position is on
a whole pixel, shift it to a half-pixel position. Otherwise
force it back to an integer position. See
doc/cairo-single-pixel-lines for more details.
*/
if (fmod (l.width, 2.) && fmod (l.pos, 1.0)) {
l.pos += 0.5;
} else {
l.pos = floor (l.pos);
}
/* If width is odd (width % 2 != 0) and position is on
a whole pixel, shift it to a half-pixel position. Otherwise
force it back to an integer position. See
doc/cairo-single-pixel-lines for more details.
*/
if (fmod (width, 2.) && !fmod (pos, 1.0)) {
/* odd width, integral position */
pos += 0.5;
} else {
if (fmod (l.width, 2.) && fmod (l.pos, 1.0)) {
l.pos += 0.5;
} else {
l.pos = floor (l.pos);
}
/* even width and/or non-integral position */
pos = floor (pos);
}
_lines.push_back (Line (pos, width, color));
}
void