ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

ruler markers: consolidate range-marker shapes 

* if the same color is used for the marker and the flag, some range markers looked odd
* now that rulers are highlighted when you hover, it's less necessary to disambiguate by shape
This commit is contained in:
Ben Loftis 2022-03-16 12:27:32 -05:00
parent 176c41a485
commit c2243d8b1c
1 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk2_ardour/marker.cc
View File

@ -207,6 +207,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
_label_offset = 12.0 * scale;
break;
case PunchIn:
case LoopStart:
case SessionStart:
case RangeStart:
points = new ArdourCanvas::Points ();
@ -219,6 +221,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
_label_offset = 8.0 * scale;
break;
case PunchOut:
case LoopEnd:
case SessionEnd:
case RangeEnd:
points = new ArdourCanvas::Points (); // leaks
@ -231,50 +235,6 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
_label_offset = 0.0 * scale;
break;
case LoopStart:
points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (0.0, 0.0));
points->push_back (ArdourCanvas::Duple (MH, MH));
points->push_back (ArdourCanvas::Duple (0.0, MH));
points->push_back (ArdourCanvas::Duple (0.0, 0.0));
_shift = 0 * scale;
_label_offset = MH;
break;
case LoopEnd:
points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (MH, 0.0));
points->push_back (ArdourCanvas::Duple (MH, MH));
points->push_back (ArdourCanvas::Duple (0.0, MH));
points->push_back (ArdourCanvas::Duple (MH, 0.0));
_shift = MH;
_label_offset = 0.0 * scale;
break;
case PunchIn:
points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (0.0, 0.0));
points->push_back (ArdourCanvas::Duple (MH, 0.0));
points->push_back (ArdourCanvas::Duple (0.0, MH));
points->push_back (ArdourCanvas::Duple (0.0, 0.0));
_shift = 0 * scale;
_label_offset = MH;
break;
case PunchOut:
points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (0.0, 0.0));
points->push_back (ArdourCanvas::Duple (MH, 0.0));
points->push_back (ArdourCanvas::Duple (MH, MH));
points->push_back (ArdourCanvas::Duple (0.0, 0.0));
_shift = MH;
_label_offset = 0.0 * scale;
break;
case Cue:
float offs = 1.0 * scale;