* bugfix from http://tracker.ardour.org/view.php?id=2155 thanks to kristian: fix...

[ardour.git] / gtk2_ardour / time_axis_view_item.h

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index e0331a2de29546c7baa6d886817dc3fce4d59b97..18d6638738cab141d121db24249593da17462e28 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -199,14 +199,9 @@ class TimeAxisViewItem : public Selectable
      *
      * @param new_name the new name text to display
      */
-    void set_name_text(std::string new_name) ;
+    void set_name_text(const Glib::ustring& new_name) ;
     
-    /**
-     * Set the height of this item
-     *
-     * @param h the new height
-     */
-    virtual void set_height(double h) ;
+    virtual void set_y_position_and_height(double y, double h) ;
     
     /**
      * 
@@ -266,7 +261,7 @@ class TimeAxisViewItem : public Selectable
     bool name_active() const { return name_connected; }
 
     // Default sizes, font and spacing
-    static Pango::FontDescription NAME_FONT ;
+    static Pango::FontDescription* NAME_FONT ;
     static bool have_name_font;
     static const double NAME_X_OFFSET ;
     static const double GRAB_HANDLE_LENGTH ;
@@ -362,7 +357,7 @@ class TimeAxisViewItem : public Selectable
     /**
      * Sets the frame color depending on whether this item is selected
      */
-    void set_frame_color() ;
+    virtual void set_frame_color() ;
     
     /**
      * Sets the colors of the start and end trim handle depending on object state
@@ -461,6 +456,11 @@ class TimeAxisViewItem : public Selectable
     ArdourCanvas::SimpleRect* frame_handle_start;
     ArdourCanvas::SimpleRect* frame_handle_end;
 
+    int name_text_width;
+    double last_name_text_width;
+
+    std::map<Glib::ustring::size_type,int> name_text_size_cache;
+    
     Visibility visibility;
 
 }; /* class TimeAxisViewItem */