X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=2d9da96b0fc3afd9a97d703bae64b37d87245c49;hb=c0641354360ee55238852fdd01704e237c6a5b16;hp=cc579ba3a449cb0c30542f202e0cc446440f3535;hpb=8bd53e2edb5212b32732789312b964fd24e305b9;p=ardour.git

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index cc579ba3a4..2d9da96b0f 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -29,11 +29,15 @@
 #include "canvas/scroll_group.h"
 #include "canvas/debug.h"
 
-#include "ardour_ui.h"
+#include "ui_config.h"
 /*
  * ardour_ui.h include was moved to the top of the list
  * due to a conflicting definition of 'Rect' between
  * Apple's MacTypes.h and GTK.
+ *
+ * Now that we are including ui_config.h and not ardour_ui.h
+ * the above comment may no longer apply and this comment
+ * can be removed and ui_config.h inclusion moved.
  */
 
 #include "marker.h"
@@ -50,16 +54,16 @@ using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
 using namespace Gtkmm2ext;
 
-PBD::Signal1<void,Marker*> Marker::CatchDeletion;
+PBD::Signal1<void,ArdourMarker*> ArdourMarker::CatchDeletion;
 
 static double marker_height = 13.0;
 
-void Marker::setup_sizes(const double timebar_height)
+void ArdourMarker::setup_sizes(const double timebar_height)
 {
 	marker_height = floor (timebar_height) - 2;
 }
 
-Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation,
+ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation,
 		Type type, framepos_t frame, bool handle_events)
 
 	: editor (ed)
@@ -77,6 +81,9 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 {
 
 	const double MH = marker_height - 1;
+	const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale()));
+	const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale()));
+
 	/* Shapes we use:
 	 *
 	 * Mark:
@@ -153,9 +160,9 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 		points = new ArdourCanvas::Points ();
 
 		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (6.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (6.0, MH * .4));
-		points->push_back (ArdourCanvas::Duple (3.0, MH));
+		points->push_back (ArdourCanvas::Duple ( M6, 0.0));
+		points->push_back (ArdourCanvas::Duple ( M6, MH * .4));
+		points->push_back (ArdourCanvas::Duple ( M3, MH));
 		points->push_back (ArdourCanvas::Duple (0.0, MH * .4));
 		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
 
@@ -166,12 +173,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 	case Tempo:
 	case Meter:
 		points = new ArdourCanvas::Points ();
-		points->push_back (ArdourCanvas::Duple (3.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (6.0, MH * .6));
-		points->push_back (ArdourCanvas::Duple (6.0, MH));
+		points->push_back (ArdourCanvas::Duple ( M3, 0.0));
+		points->push_back (ArdourCanvas::Duple ( M6, MH * .6));
+		points->push_back (ArdourCanvas::Duple ( M6, MH));
 		points->push_back (ArdourCanvas::Duple (0.0, MH));
 		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;
 		_label_offset = 8.0;
@@ -180,10 +187,10 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 	case SessionStart:
 	case RangeStart:
 		points = new ArdourCanvas::Points ();
-		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (6.5, MH * .5));
-		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));
+		points->push_back (ArdourCanvas::Duple (M6 + .5, MH * .5));
+		points->push_back (ArdourCanvas::Duple (    0.0, MH));
+		points->push_back (ArdourCanvas::Duple (    0.0, 0.0));
 
 		_shift = 0;
 		_label_offset = 8.0;
@@ -192,12 +199,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 	case SessionEnd:
 	case RangeEnd:
 		points = new ArdourCanvas::Points ();
-		points->push_back (ArdourCanvas::Duple (6.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (6.0, MH));
+		points->push_back (ArdourCanvas::Duple ( M6, 0.0));
+		points->push_back (ArdourCanvas::Duple ( M6, MH));
 		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;
 		break;
 
@@ -254,12 +261,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 	group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 0));
 #ifdef CANVAS_DEBUG
 	group->name = string_compose ("Marker::group for %1", annotation);
-#endif	
+#endif
 
-	_name_background = new ArdourCanvas::TimeRectangle (group);
+	_name_background = new ArdourCanvas::Rectangle (group);
 #ifdef CANVAS_DEBUG
 	_name_background->name = string_compose ("Marker::_name_background for %1", annotation);
-#endif	
+#endif
 
 	/* adjust to properly locate the tip */
 
@@ -279,16 +286,16 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 
 	layout->set_font_description (name_font);
 	Gtkmm2ext::get_ink_pixel_size (layout, width, name_height);
-	
+
 	_name_item = new ArdourCanvas::Text (group);
-	CANVAS_DEBUG_NAME (_name_item, string_compose ("Marker::_name_item for %1", annotation));
+	CANVAS_DEBUG_NAME (_name_item, string_compose ("ArdourMarker::_name_item for %1", annotation));
 	_name_item->set_font_description (name_font);
 	_name_item->set_color (RGBA_TO_UINT (0,0,0,255));
 	_name_item->set_position (ArdourCanvas::Duple (_label_offset, (marker_height - name_height - 1) * .5 ));
 
 	set_name (annotation.c_str());
 
-	editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition));
+	editor.ZoomChanged.connect (sigc::mem_fun (*this, &ArdourMarker::reposition));
 
 	/* events will be handled by both the group and the mark itself, so
 	 * make sure they can both be used to lookup this object.
@@ -296,13 +303,13 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 
 	group->set_data ("marker", this);
 	mark->set_data ("marker", this);
-	
+
 	if (handle_events) {
 		group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
 	}
 }
 
-Marker::~Marker ()
+ArdourMarker::~ArdourMarker ()
 {
 	CatchDeletion (this); /* EMIT SIGNAL */
 
@@ -311,35 +318,35 @@ Marker::~Marker ()
 	delete _track_canvas_line;
 }
 
-void Marker::reparent(ArdourCanvas::Container & parent)
+void ArdourMarker::reparent(ArdourCanvas::Container & parent)
 {
 	group->reparent (&parent);
 	_parent = &parent;
 }
 
 void
-Marker::set_selected (bool s)
+ArdourMarker::set_selected (bool s)
 {
 	_selected = s;
 	setup_line ();
 }
 
 void
-Marker::set_show_line (bool s)
+ArdourMarker::set_show_line (bool s)
 {
 	_line_shown = s;
 	setup_line ();
 }
 
 void
-Marker::setup_line ()
+ArdourMarker::setup_line ()
 {
 	if (_shown && (_selected || _line_shown)) {
 
 		if (_track_canvas_line == 0) {
 
 			_track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group());
-			_track_canvas_line->set_outline_color (ARDOUR_UI::config()->color ("edit point"));
+			_track_canvas_line->set_outline_color (UIConfiguration::instance().color ("edit point"));
 			_track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
 		}
 
@@ -350,7 +357,7 @@ Marker::setup_line ()
 		_track_canvas_line->set_x1 (d.x);
 		_track_canvas_line->set_y0 (d.y);
 		_track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX);
-		_track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->color ("edit point") : _color);
+		_track_canvas_line->set_outline_color (_selected ? UIConfiguration::instance().color ("edit point") : _color);
 		_track_canvas_line->raise_to_top ();
 		_track_canvas_line->show ();
 
@@ -362,20 +369,20 @@ Marker::setup_line ()
 }
 
 void
-Marker::canvas_height_set (double h)
+ArdourMarker::canvas_height_set (double h)
 {
 	_canvas_height = h;
 	setup_line ();
 }
 
 ArdourCanvas::Item&
-Marker::the_item() const
+ArdourMarker::the_item() const
 {
 	return *group;
 }
 
 void
-Marker::set_name (const string& new_name)
+ArdourMarker::set_name (const string& new_name)
 {
 	_name = new_name;
 
@@ -384,13 +391,13 @@ Marker::set_name (const string& new_name)
 
 /** @return true if our label is on the left of the mark, otherwise false */
 bool
-Marker::label_on_left () const
+ArdourMarker::label_on_left () const
 {
 	return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut);
 }
 
 void
-Marker::setup_name_display ()
+ArdourMarker::setup_name_display ()
 {
 	double limit = DBL_MAX;
 
@@ -400,8 +407,10 @@ Marker::setup_name_display ()
 		limit = _right_label_limit;
 	}
 
+	const float padding =  std::max(2.f, rintf(2.f * UIConfiguration::instance().get_ui_scale()));
+
 	/* 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) {
 		_name_item->hide ();
@@ -411,29 +420,29 @@ Marker::setup_name_display ()
 		if (label_on_left ()) {
 			_name_item->set_x_position (-name_width);
 		}
-			
+
 		_name_item->clamp_width (name_width);
 		_name_item->set (_name);
-		
+
 		if (label_on_left ()) {
 			/* 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);
 		} else {
 			/* right edge remains at zero (group-relative). Add
 			 * 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);
 		}
 	}
 
 	_name_background->set_y0 (0);
 	/* unfortunate hard coding - this has to * match the marker bars height */
-	_name_background->set_y1 (marker_height + 1.0); 
+	_name_background->set_y1 (marker_height + 1.0);
 }
 
 void
-Marker::set_position (framepos_t frame)
+ArdourMarker::set_position (framepos_t frame)
 {
 	unit_position = editor.sample_to_pixel (frame) - _shift;
 	group->set_x_position (unit_position);
@@ -442,13 +451,13 @@ Marker::set_position (framepos_t frame)
 }
 
 void
-Marker::reposition ()
+ArdourMarker::reposition ()
 {
 	set_position (frame_position);
 }
 
 void
-Marker::show ()
+ArdourMarker::show ()
 {
 	_shown = true;
 
@@ -457,7 +466,7 @@ Marker::show ()
 }
 
 void
-Marker::hide ()
+ArdourMarker::hide ()
 {
 	_shown = false;
 
@@ -466,7 +475,7 @@ Marker::hide ()
 }
 
 void
-Marker::set_color_rgba (uint32_t c)
+ArdourMarker::set_color_rgba (uint32_t c)
 {
 	_color = c;
 	mark->set_fill_color (_color);
@@ -483,7 +492,7 @@ Marker::set_color_rgba (uint32_t c)
 
 /** Set the number of pixels that are available for a label to the left of the centre of this marker */
 void
-Marker::set_left_label_limit (double p)
+ArdourMarker::set_left_label_limit (double p)
 {
 	/* Account for the size of the marker */
 	_left_label_limit = p - marker_height;
@@ -498,7 +507,7 @@ Marker::set_left_label_limit (double p)
 
 /** Set the number of pixels that are available for a label to the right of the centre of this marker */
 void
-Marker::set_right_label_limit (double p)
+ArdourMarker::set_right_label_limit (double p)
 {
 	/* Account for the size of the marker */
 	_right_label_limit = p - marker_height;
@@ -515,7 +524,7 @@ Marker::set_right_label_limit (double p)
 
 TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
 			  ARDOUR::TempoSection& temp)
-	: Marker (editor, parent, rgba, text, Tempo, 0, false),
+	: ArdourMarker (editor, parent, rgba, text, Tempo, 0, false),
 	  _tempo (temp)
 {
 	set_position (_tempo.frame());
@@ -530,7 +539,7 @@ TempoMarker::~TempoMarker ()
 
 MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
 			  ARDOUR::MeterSection& m)
-	: Marker (editor, parent, rgba, text, Meter, 0, false),
+	: ArdourMarker (editor, parent, rgba, text, Meter, 0, false),
 	  _meter (m)
 {
 	set_position (_meter.frame());