projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove inadvertently committed wine-unstable linkdir
[ardour.git] / gtk2_ardour / marker.cc
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 1e4809f6c2115121c64969b84eecf807055cc2f6..0242ab98b71689c9a21557a90a071f48d0f72f36 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -26,6 +26,7 @@
 #include "canvas/polygon.h"
 #include "canvas/text.h"
 #include "canvas/canvas.h"
+#include "canvas/debug.h"
 
 #include "ardour_ui.h"
 /*
@@ -49,6 +50,8 @@ using namespace Gtkmm2ext;
 
 PBD::Signal1<void,Marker*> Marker::CatchDeletion;
 
+static const double marker_height = 13.0;
+
 Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation,
                Type type, framepos_t frame, bool handle_events)
 
@@ -75,7 +78,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
             |        V
            (0,5)    (6,5)
               \    /
-               (3,13)
+               (3,marker_height)
 
 
           TempoMark:
@@ -111,25 +114,25 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
              PunchIn:
 
-            0,0 ------> 13,0
+            0,0 ------> marker_height,0
              |       /
              |      /
              |     /
              |    /
              |   /
              |  /
-            0,13
+            0,marker_height
 
             PunchOut
 
-          0,0 -->-13,0
+          0,0 -->-marker_height,0
            \       |
             \      |
              \     |
               \    |
                \   |
                 \  |
-                13,13
+                marker_height,marker_height
 
 
        */
@@ -141,7 +144,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
                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, 5.0));
-               points->push_back (ArdourCanvas::Duple (3.0, 13.0));
+               points->push_back (ArdourCanvas::Duple (3.0, marker_height));
                points->push_back (ArdourCanvas::Duple (0.0, 5.0));
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
 
@@ -170,30 +173,30 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
                points = new ArdourCanvas::Points ();
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
                points->push_back (ArdourCanvas::Duple (6.5, 6.5));
-               points->push_back (ArdourCanvas::Duple (0.0, 13.0));
+               points->push_back (ArdourCanvas::Duple (0.0, marker_height));
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
 
                _shift = 0;
-               _label_offset = 13.0;
+               _label_offset = marker_height;
                break;
 
        case SessionEnd:
        case RangeEnd:
                points = new ArdourCanvas::Points ();
                points->push_back (ArdourCanvas::Duple (6.5, 6.5));
-               points->push_back (ArdourCanvas::Duple (13.0, 0.0));
-               points->push_back (ArdourCanvas::Duple (13.0, 13.0));
+               points->push_back (ArdourCanvas::Duple (marker_height, 0.0));
+               points->push_back (ArdourCanvas::Duple (marker_height, marker_height));
                points->push_back (ArdourCanvas::Duple (6.5, 6.5));
 
-               _shift = 13;
+               _shift = marker_height;
                _label_offset = 6.0;
                break;
 
        case LoopStart:
                points = new ArdourCanvas::Points ();
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-               points->push_back (ArdourCanvas::Duple (13.0, 13.0));
-               points->push_back (ArdourCanvas::Duple (0.0, 13.0));
+               points->push_back (ArdourCanvas::Duple (marker_height, marker_height));
+               points->push_back (ArdourCanvas::Duple (0.0, marker_height));
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
 
                _shift = 0;
@@ -202,24 +205,24 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
        case LoopEnd:
                points = new ArdourCanvas::Points ();
-               points->push_back (ArdourCanvas::Duple (13.0,  0.0));
-               points->push_back (ArdourCanvas::Duple (13.0, 13.0));
-               points->push_back (ArdourCanvas::Duple (0.0, 13.0));
-               points->push_back (ArdourCanvas::Duple (13.0, 0.0));
+               points->push_back (ArdourCanvas::Duple (marker_height,  0.0));
+               points->push_back (ArdourCanvas::Duple (marker_height, marker_height));
+               points->push_back (ArdourCanvas::Duple (0.0, marker_height));
+               points->push_back (ArdourCanvas::Duple (marker_height, 0.0));
 
-               _shift = 13;
+               _shift = marker_height;
                _label_offset = 0.0;
                break;
 
        case  PunchIn:
                points = new ArdourCanvas::Points ();
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-               points->push_back (ArdourCanvas::Duple (13.0, 0.0));
-               points->push_back (ArdourCanvas::Duple (0.0, 13.0));
+               points->push_back (ArdourCanvas::Duple (marker_height, 0.0));
+               points->push_back (ArdourCanvas::Duple (0.0, marker_height));
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
 
                _shift = 0;
-               _label_offset = 13.0;
+               _label_offset = marker_height;
                break;
 
        case  PunchOut:
@@ -229,7 +232,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
                points->push_back (ArdourCanvas::Duple (12.0, 12.0));
                points->push_back (ArdourCanvas::Duple (0.0, 0.0));
 
-               _shift = 13;
+               _shift = marker_height;
                _label_offset = 0.0;
                break;
 
@@ -248,17 +251,14 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 #ifdef CANVAS_DEBUG
        _name_background->name = string_compose ("Marker::_name_background for %1", annotation);
 #endif 
-       _name_background->set_outline_width (1);
 
        /* adjust to properly locate the tip */
 
        mark = new ArdourCanvas::Polygon (group);
-#ifdef CANVAS_DEBUG
-       mark->name = string_compose ("Marker::mark for %1", annotation);
-#endif 
+       CANVAS_DEBUG_NAME (mark, string_compose ("Marker::mark for %1", annotation));
+
        mark->set (*points);
        set_color_rgba (rgba);
-       mark->set_outline_width (1);
 
        /* setup name pixbuf sizes */
        name_font = get_font_for_style (N_("MarkerText"));
@@ -272,13 +272,10 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
        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));
        _name_item->set_font_description (name_font);
        _name_item->set_color (RGBA_TO_UINT (0,0,0,255));
-
-#ifdef CANVAS_DEBUG
-       _name_item->name = string_compose ("Marker::_name_item for %1", annotation);
-#endif 
-       _name_item->set_position (ArdourCanvas::Duple (_label_offset, (13.0 / 2.0) - (name_height / 2.0)));
+       _name_item->set_position (ArdourCanvas::Duple (_label_offset, (marker_height / 2.0) - (name_height / 2.0) - 2.0));
 
        set_name (annotation.c_str());
 
@@ -294,7 +291,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
        if (handle_events) {
                group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
        }
-
 }
 
 Marker::~Marker ()
@@ -335,11 +331,11 @@ Marker::setup_line ()
                if (_time_bars_line == 0) {
 
                        _time_bars_line = new ArdourCanvas::Line (editor.get_time_bars_group());
-                       _time_bars_line->set_outline_color (ARDOUR_UI::config()->canvasvar_EditPoint.get());
+                       _time_bars_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
                        _time_bars_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                        
                        _track_canvas_line = new ArdourCanvas::Line (editor.get_track_canvas_group());
-                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->canvasvar_EditPoint.get());
+                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
                        _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                }
 
@@ -350,7 +346,7 @@ Marker::setup_line ()
                 _time_bars_line->set_x1 (d.x);
                _time_bars_line->set_y0 (d.y);
                _time_bars_line->set_y1 (ArdourCanvas::COORD_MAX);
-               _time_bars_line->set_outline_color (_selected ? ARDOUR_UI::config()->canvasvar_EditPoint.get() : _color);
+               _time_bars_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
                _time_bars_line->raise_to_top ();
                _time_bars_line->show ();
 
@@ -359,7 +355,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()->canvasvar_EditPoint.get() : _color);
+               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
                _track_canvas_line->raise_to_top ();
                _track_canvas_line->show ();
 
@@ -414,28 +410,29 @@ Marker::setup_name_display ()
        int name_width = min ((double) pixel_width (_name, name_font) + 2, limit);
 
        if (name_width == 0) {
-               name_width = 1;
-       }
-
-       if (label_on_left ()) {
-               _name_item->set_x_position (-name_width);
-       }
-
-       _name_item->set (_name);
-
-       // CAIROCANVAS
-       // need to "clip" name to name_width and name_height
-
-       if (label_on_left ()) {
-               _name_background->set_x0 (_name_item->position().x - 2);
-               _name_background->set_x1 (_name_item->position().x + name_width + _shift);
+               _name_item->hide ();
        } else {
-               _name_background->set_x0 (_name_item->position().x - _label_offset + 2);
-               _name_background->set_x1 (_name_item->position().x + name_width);
+               _name_item->show ();
+
+               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 ()) {
+                       _name_background->set_x0 (_name_item->position().x - 2);
+                       _name_background->set_x1 (_name_item->position().x + name_width + _shift);
+               } else {
+                       _name_background->set_x0 (_name_item->position().x - _label_offset + 2);
+                       _name_background->set_x1 (_name_item->position().x + name_width);
+               }
        }
 
        _name_background->set_y0 (0);
-       _name_background->set_y1 (13);
+       /* unfortunate hard coding - this has to * match the marker bars height */
+       _name_background->set_y1 (marker_height + 1.0); 
 }
 
 void
@@ -493,7 +490,7 @@ void
 Marker::set_left_label_limit (double p)
 {
        /* Account for the size of the marker */
-       _left_label_limit = p - 13;
+       _left_label_limit = p - marker_height;
        if (_left_label_limit < 0) {
                _left_label_limit = 0;
        }
@@ -508,7 +505,7 @@ void
 Marker::set_right_label_limit (double p)
 {
        /* Account for the size of the marker */
-       _right_label_limit = p - 13;
+       _right_label_limit = p - marker_height;
        if (_right_label_limit < 0) {
                _right_label_limit = 0;
        }
Unnamed repository; edit this file 'description' to name the repository.