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

Fix boundary condition first/last marker label length

Browse source
This commit is contained in:
Robin Gareus 2024-05-08 19:16:07 +02:00
parent a0dc432e7a
commit c62fbc5c5b
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/editor_markers.cc
View file

@ -435,14 +435,19 @@ Editor::update_marker_labels (ArdourCanvas::Item* group)
--pi; --pi;
} }
double const p = sample_to_pixel ((*pi)->position().distance ((*i)->position()).samples()); double p = sample_to_pixel ((*pi)->position().distance ((*i)->position()).samples());
if (p == 0) {
p = DBL_MAX;
}
if ((*prev)->label_on_left()) { if ((*prev)->label_on_left()) {
(*i)->set_left_label_limit (p); (*i)->set_left_label_limit (p);
} else { } else {
(*i)->set_left_label_limit (p / 2); (*i)->set_left_label_limit (p / 2);
} }
} else {
(*i)->set_left_label_limit (DBL_MAX);
} }
while (next != sorted.end() && (*next)->position () == (*i)->position ()) { while (next != sorted.end() && (*next)->position () == (*i)->position ()) {
@ -459,6 +464,8 @@ Editor::update_marker_labels (ArdourCanvas::Item* group)
} }
++next; ++next;
} else {
(*i)->set_right_label_limit (DBL_MAX);
} }
prev = i; prev = i;