make Item::set_position() do nothing if the position doesn't change
[ardour.git] / gtk2_ardour / time_axis_view_item.cc
index a200b71f9f93e054060d4f49a2165b2c3ef4ca6c..6b9c35bb326ed6140156858a144b812a1bb653fe 100644 (file)
@@ -31,6 +31,7 @@
 #include "canvas/group.h"
 #include "canvas/rectangle.h"
 #include "canvas/debug.h"
+#include "canvas/drag_handle.h"
 #include "canvas/text.h"
 #include "canvas/utils.h"
 
@@ -80,10 +81,12 @@ TimeAxisViewItem::set_constant_heights ()
         int height = 0;
 
         layout->set_font_description (NAME_FONT);
-        Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+        get_pixel_size (layout, width, height);
+
+        layout = foo.create_pango_layout (X_("H")); /* just the ascender */
 
         NAME_HEIGHT = height;
-        NAME_Y_OFFSET = height + 5; // XXX this offset is magic
+        NAME_Y_OFFSET = height + 2;
         NAME_HIGHLIGHT_SIZE = height + 2;
         NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
 }
@@ -111,7 +114,7 @@ TimeAxisViewItem::TimeAxisViewItem(
        , _recregion (recording)
        , _automation (automation)
        , _dragging (false)
-
+       , _width (0.0)
 {
        init (&parent, spu, base_color, start, duration, vis, true, true);
 }
@@ -122,9 +125,11 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
        , PBD::ScopedConnectionList()
        , trackview (other.trackview)
        , item_name (other.item_name)
+       , _height (1.0)
        , _recregion (other._recregion)
        , _automation (other._automation)
        , _dragging (other._dragging)
+       , _width (0.0)
 {
 
        Gdk::Color c;
@@ -181,7 +186,7 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
 
        if (visibility & ShowFrame) {
                frame = new ArdourCanvas::Rectangle (group, 
-                                                    ArdourCanvas::Rect (0.0, 1.0, 
+                                                    ArdourCanvas::Rect (0.0, 0.0, 
                                                                         trackview.editor().sample_to_pixel(duration), 
                                                                         trackview.current_height()));
 
@@ -193,6 +198,8 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
                        frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
                }
 
+               // frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::LEFT));
+
        } else {
 
                frame = 0;
@@ -200,23 +207,25 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
 
        if (visibility & ShowNameHighlight) {
 
+               double width;
+               double start;
+
                if (visibility & FullWidthNameHighlight) {
-                       name_highlight = new ArdourCanvas::Rectangle (group, 
-                                                                     ArdourCanvas::Rect (0.0, trackview.editor().sample_to_pixel(item_duration),
-                                                                                         trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
-                                                                                         trackview.current_height()));
-                       CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
+                       start = 0.0;
+                       width = trackview.editor().sample_to_pixel(item_duration);
                } else {
-                       name_highlight = new ArdourCanvas::Rectangle (group, 
-                                                                     ArdourCanvas::Rect (1.0, trackview.editor().sample_to_pixel(item_duration) - 1, 
-                                                                                         trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
-                                                                                         trackview.current_height()));
-                       CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
+                       start = 1.0;
+                       width = trackview.editor().sample_to_pixel(item_duration) - 2.0;
                }
 
+               name_highlight = new ArdourCanvas::Rectangle (group, 
+                                                             ArdourCanvas::Rect (start, 
+                                                                                 trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
+                                                                                 width - 4,
+                                                                                 trackview.current_height()));
+               CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
                name_highlight->set_data ("timeaxisviewitem", this);
                 name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
-                /* we should really use a canvas color property here */
                name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255));
 
        } else {
@@ -228,7 +237,6 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
                CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
                name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
                name_text->set_font_description (NAME_FONT);
-               
        } else {
                name_text = 0;
        }
@@ -238,13 +246,13 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons
                double top   = TimeAxisViewItem::GRAB_HANDLE_TOP;
                double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH;
 
-               frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
+               frame_handle_start = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), true);
                CANVAS_DEBUG_NAME (frame_handle_start, "TAVI frame handle start");
                frame_handle_start->set_outline (false);
                frame_handle_start->set_fill (false);
                frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_start));
 
-               frame_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
+               frame_handle_end = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), false);
                CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end");
                frame_handle_end->set_outline (false);
                frame_handle_end->set_fill (false);
@@ -546,7 +554,6 @@ TimeAxisViewItem::set_name_text(const string& new_name)
                return;
        }
 
-       last_item_width = trackview.editor().sample_to_pixel(item_duration);
        name_text_width = pixel_width (new_name, NAME_FONT) + 2;
        name_text->set (new_name);
 
@@ -562,45 +569,61 @@ TimeAxisViewItem::set_height (double height)
 {
         _height = height;
 
-       if (name_highlight) {
-               if (height < NAME_HIGHLIGHT_THRESH) {
-                       name_highlight->hide ();
-                       high_enough_for_name = false;
-
-               } else {
-                       name_highlight->show();
-                       high_enough_for_name = true;
-               }
-
-               if (height > NAME_HIGHLIGHT_SIZE) {
-                       name_highlight->set_y0 ((double) height - 1 - NAME_HIGHLIGHT_SIZE);
-                       name_highlight->set_y1 ((double) height - 1);
-               }
-               else {
-                       /* it gets hidden now anyway */
-                       name_highlight->set_y0 (1);
-                       name_highlight->set_y1 (height);
-               }
-       }
+       manage_name_highlight ();
 
        if (visibility & ShowNameText) {
-               name_text->set_y_position (height + 1 - NAME_Y_OFFSET);
+               name_text->set_y_position (height - NAME_Y_OFFSET); 
        }
 
        if (frame) {
-               frame->set_y1 (height - 1);
+               frame->set_y1 (height);
                if (frame_handle_start) {
-                       frame_handle_start->set_y1 (height - 1);
-                       frame_handle_end->set_y1 (height - 1);
+                       frame_handle_start->set_y1 (height);
+                       frame_handle_end->set_y1 (height);
                }
        }
 
        vestigial_frame->set_y1 (height - 1);
 
-       update_name_text_visibility ();
        set_colors ();
 }
 
+void
+TimeAxisViewItem::manage_name_highlight ()
+{
+       if (!name_highlight) {
+               return;
+       }
+
+       if (_height < NAME_HIGHLIGHT_THRESH) {
+               high_enough_for_name = false;
+       } else {
+               high_enough_for_name = true;
+       }
+
+       if (_width < 2.0) {
+               wide_enough_for_name = false;
+       } else {
+               wide_enough_for_name = true;
+       }
+
+       if (name_highlight && wide_enough_for_name && high_enough_for_name) {
+
+               name_highlight->show();
+
+               name_highlight->set_y0 ((double) _height - 1 - NAME_HIGHLIGHT_SIZE);
+               name_highlight->set_y1 ((double) _height - 1);
+               
+               /* x0 is always zero */
+               name_highlight->set_x1 (_width-1.0);
+                       
+       } else {
+               name_highlight->hide();
+       }
+
+       manage_name_text ();
+}
+
 void
 TimeAxisViewItem::set_color (Gdk::Color const & base_color)
 {
@@ -942,16 +965,16 @@ TimeAxisViewItem::set_samples_per_pixel (double fpp)
 void
 TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 {
+       _width = pixel_width;
+
+       manage_name_highlight ();
+
        if (pixel_width < 2.0) {
 
                if (show_vestigial) {
                        vestigial_frame->show();
                }
 
-               if (name_highlight) {
-                       name_highlight->hide();
-               }
-
                if (frame) {
                        frame->hide();
                }
@@ -961,27 +984,9 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
                        frame_handle_end->hide();
                }
 
-               wide_enough_for_name = false;
-
        } else {
                vestigial_frame->hide();
 
-               if (name_highlight) {
-
-                       if (_height < NAME_HIGHLIGHT_THRESH) {
-                               name_highlight->hide();
-                               high_enough_for_name = false;
-                       } else {
-                               name_highlight->show();
-                               if (!get_item_name().empty()) {
-                                       reset_name_width (pixel_width);
-                               }
-                               high_enough_for_name = true;
-                       }
-
-                       name_highlight->set_x1 (pixel_width);
-               }
-
                if (frame) {
                        frame->show();
                        frame->set_x1 (pixel_width);
@@ -1004,56 +1009,39 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
                                frame_handle_end->show();
                        }
                }
-
-               wide_enough_for_name = true;
        }
-
-        update_name_text_visibility ();
 }
 
 void
-TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
+TimeAxisViewItem::manage_name_text ()
 {
-       uint32_t it_width;
-       int pb_width;
-       bool showing_full_name;
+       int visible_name_width;
 
        if (!name_text) {
                return;
        }
 
-       it_width = trackview.editor().sample_to_pixel(item_duration);
-       pb_width = name_text_width;
-
-       showing_full_name = last_item_width > pb_width + NAME_X_OFFSET;
-       last_item_width = it_width;
-
-       if (showing_full_name && (it_width >= pb_width + NAME_X_OFFSET)) {
-               /*
-                 we've previously had the full name length showing
-                 and its still showing.
-               */
+       if (!wide_enough_for_name || !high_enough_for_name) {
+               name_text->hide ();
                return;
        }
-
-       if (pb_width > it_width - NAME_X_OFFSET) {
-               pb_width = it_width - NAME_X_OFFSET;
-       }
-
-       if (it_width <= NAME_X_OFFSET) {
-               wide_enough_for_name = false;
-       } else {
-               wide_enough_for_name = true;
+               
+       if (name_text->text().empty()) {
+               name_text->hide ();
        }
 
-       update_name_text_visibility ();
+       visible_name_width = name_text_width;
 
-       if (pb_width < 1) {
-               pb_width = 1;
+       if (visible_name_width > _width - NAME_X_OFFSET) {
+               visible_name_width = _width - NAME_X_OFFSET;
        }
 
-       name_text->set (item_name);
-       name_text->clamp_width (pb_width);
+       if (visible_name_width < 1) {
+               name_text->hide ();
+       } else {
+               name_text->clamp_width (visible_name_width);
+               name_text->show ();
+       }
 }
 
 /**
@@ -1079,20 +1067,6 @@ TimeAxisViewItem::set_y (double y)
        group->set_y_position (y);
 }
 
-void
-TimeAxisViewItem::update_name_text_visibility ()
-{
-       if (!name_text) {
-               return;
-       }
-
-       if (wide_enough_for_name && high_enough_for_name) {
-               name_text->show ();
-       } else {
-               name_text->hide ();
-       }
-}
-
 void
 TimeAxisViewItem::parameter_changed (string p)
 {