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

scale markers

Browse source
This commit is contained in:
Robin Gareus 2015-04-23 00:22:53 +02:00
parent 5afc5272b6
commit a7fd61ce4f
1 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gtk2_ardour/marker.cc
View file

@ -77,6 +77,9 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
{ {
const double MH = marker_height - 1; const double MH = marker_height - 1;
const double M3 = std::max(1.f, rintf(3.f * ARDOUR_UI::ui_scale));
const double M6 = std::max(2.f, rintf(6.f * ARDOUR_UI::ui_scale));
/* Shapes we use: /* Shapes we use:
* *
* Mark: * Mark:
@ -153,9 +156,9 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
points = new ArdourCanvas::Points (); points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (0.0, 0.0)); points->push_back (ArdourCanvas::Duple (0.0, 0.0));
points->push_back (ArdourCanvas::Duple (6.0, 0.0)); points->push_back (ArdourCanvas::Duple ( M6, 0.0));
points->push_back (ArdourCanvas::Duple (6.0, MH * .4)); points->push_back (ArdourCanvas::Duple ( M6, MH * .4));
points->push_back (ArdourCanvas::Duple (3.0, MH)); points->push_back (ArdourCanvas::Duple ( M3, MH));
points->push_back (ArdourCanvas::Duple (0.0, MH * .4)); points->push_back (ArdourCanvas::Duple (0.0, MH * .4));
points->push_back (ArdourCanvas::Duple (0.0, 0.0)); points->push_back (ArdourCanvas::Duple (0.0, 0.0));
@ -166,12 +169,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
case Tempo: case Tempo:
case Meter: case Meter:
points = new ArdourCanvas::Points (); points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (3.0, 0.0)); points->push_back (ArdourCanvas::Duple ( M3, 0.0));
points->push_back (ArdourCanvas::Duple (6.0, MH * .6)); points->push_back (ArdourCanvas::Duple ( M6, MH * .6));
points->push_back (ArdourCanvas::Duple (6.0, MH)); points->push_back (ArdourCanvas::Duple ( M6, MH));
points->push_back (ArdourCanvas::Duple (0.0, MH)); points->push_back (ArdourCanvas::Duple (0.0, MH));
points->push_back (ArdourCanvas::Duple (0.0, MH * .6)); points->push_back (ArdourCanvas::Duple (0.0, MH * .6));
points->push_back (ArdourCanvas::Duple (3.0, 0.0)); points->push_back (ArdourCanvas::Duple ( M3, 0.0));
_shift = 3; _shift = 3;
_label_offset = 8.0; _label_offset = 8.0;
@ -180,10 +183,10 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
case SessionStart: case SessionStart:
case RangeStart: case RangeStart:
points = new ArdourCanvas::Points (); points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (0.0, 0.0)); points->push_back (ArdourCanvas::Duple ( 0.0, 0.0));
points->push_back (ArdourCanvas::Duple (6.5, MH * .5)); points->push_back (ArdourCanvas::Duple (M6 + .5, MH * .5));
points->push_back (ArdourCanvas::Duple (0.0, MH)); points->push_back (ArdourCanvas::Duple ( 0.0, MH));
points->push_back (ArdourCanvas::Duple (0.0, 0.0)); points->push_back (ArdourCanvas::Duple ( 0.0, 0.0));
_shift = 0; _shift = 0;
_label_offset = 8.0; _label_offset = 8.0;
@ -192,12 +195,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
case SessionEnd: case SessionEnd:
case RangeEnd: case RangeEnd:
points = new ArdourCanvas::Points (); points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple (6.0, 0.0)); points->push_back (ArdourCanvas::Duple ( M6, 0.0));
points->push_back (ArdourCanvas::Duple (6.0, MH)); points->push_back (ArdourCanvas::Duple ( M6, MH));
points->push_back (ArdourCanvas::Duple (0.0, MH * .5)); points->push_back (ArdourCanvas::Duple (0.0, MH * .5));
points->push_back (ArdourCanvas::Duple (6.0, 0.0)); points->push_back (ArdourCanvas::Duple ( M6, 0.0));
_shift = 6.0; _shift = M6;
_label_offset = 0.0; _label_offset = 0.0;
break; break;
@ -400,8 +403,10 @@ Marker::setup_name_display ()
limit = _right_label_limit; limit = _right_label_limit;
} }
const float padding = std::max(2.f, rintf(2.f * ARDOUR_UI::ui_scale));
/* Work out how wide the name can be */ /* Work out how wide the name can be */
int name_width = min ((double) pixel_width (_name, name_font) + 2, limit); int name_width = min ((double) pixel_width (_name, name_font) + padding, limit);
if (name_width == 0) { if (name_width == 0) {
_name_item->hide (); _name_item->hide ();
@ -417,13 +422,13 @@ Marker::setup_name_display ()
if (label_on_left ()) { if (label_on_left ()) {
/* adjust right edge of background to fit text */ /* adjust right edge of background to fit text */
_name_background->set_x0 (_name_item->position().x - 2); _name_background->set_x0 (_name_item->position().x - padding);
_name_background->set_x1 (_name_item->position().x + name_width + _shift); _name_background->set_x1 (_name_item->position().x + name_width + _shift);
} else { } else {
/* right edge remains at zero (group-relative). Add /* right edge remains at zero (group-relative). Add
* arbitrary 2 pixels of extra padding at the end * arbitrary 2 pixels of extra padding at the end
*/ */
_name_background->set_x1 (_name_item->position().x + name_width + 2.0); _name_background->set_x1 (_name_item->position().x + name_width + padding);
} }
} }