X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=0e66ab2bae2b1372344f565c1572471e7a97df30;hb=1315ee3dff1e4966ab28bd47e81b5f003cac6e40;hp=09d959358dd0d79a3a5474bd19c376c99d3d89d8;hpb=edfc81352e66a412c6bc180c15f788512eccbe42;p=ardour.git diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 09d959358d..0e66ab2bae 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -18,6 +18,7 @@ */ #include +#include #include #include @@ -125,6 +126,8 @@ void TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_color, nframes_t start, nframes_t duration, Visibility vis) { item_name = it_name ; + name_text_width = ::pixel_width (it_name, NAME_FONT); + last_name_text_width = 0; samples_per_unit = spu ; should_show_selection = true; frame_position = start ; @@ -488,6 +491,7 @@ TimeAxisViewItem::set_item_name(std::string new_name, void* src) if (new_name != item_name) { std::string temp_name = item_name ; item_name = new_name ; + name_text_width = ::pixel_width (new_name, NAME_FONT); NameChanged (item_name, temp_name, src) ; /* EMIT_SIGNAL */ } } @@ -553,23 +557,26 @@ TimeAxisViewItem::get_time_axis_view() * @param new_name the new name text to display */ void -TimeAxisViewItem::set_name_text(std::string new_name) +TimeAxisViewItem::set_name_text(const ustring& new_name) { if (name_text) { - name_text->property_text() = new_name.c_str(); + name_text->property_text() = new_name; + name_text_width = pixel_width (new_name, NAME_FONT); + name_text_size_cache.clear (); } } /** - * Set the height of this item + * Set the y position and height of this item. * + * @param y the new y position * @param h the new height */ void -TimeAxisViewItem::set_height(double height) +TimeAxisViewItem::set_y_position_and_height (double y, double h) { if (name_highlight) { - if (height < NAME_HIGHLIGHT_THRESH) { + if (h < NAME_HIGHLIGHT_THRESH) { name_highlight->hide(); if (name_text) { name_text->hide(); @@ -581,20 +588,20 @@ TimeAxisViewItem::set_height(double height) } } - if (height > NAME_HIGHLIGHT_SIZE) { - name_highlight->property_y1() = (double) height+1 - NAME_HIGHLIGHT_SIZE; - name_highlight->property_y2() = (double) height; + if (h > NAME_HIGHLIGHT_SIZE) { + name_highlight->property_y1() = (double) y + h + 1 - NAME_HIGHLIGHT_SIZE; + name_highlight->property_y2() = (double) y + h; } else { /* it gets hidden now anyway */ - name_highlight->property_y1() = (double) 1.0; - name_highlight->property_y2() = (double) height; + name_highlight->property_y1() = (double) y; + name_highlight->property_y2() = (double) y + h; } } if (name_text) { - name_text->property_y() = height+1 - NAME_Y_OFFSET; - if (height < NAME_HIGHLIGHT_THRESH) { + name_text->property_y() = y + h + 1 - NAME_Y_OFFSET; + if (h < NAME_HIGHLIGHT_THRESH) { name_text->property_fill_color_rgba() = fill_color; } else { @@ -603,10 +610,12 @@ TimeAxisViewItem::set_height(double height) } if (frame) { - frame->property_y2() = height+1; + frame->property_y1() = y; + frame->property_y2() = y + h + 1; } - vestigial_frame->property_y2() = height+1; + vestigial_frame->property_y1() = y; + vestigial_frame->property_y2() = y + h + 1; } /** @@ -913,34 +922,87 @@ TimeAxisViewItem::reset_name_width (double pixel_width) if (name_text == 0) { return; } - - int width; - - ustring ustr = fit_to_pixels (item_name, (int) floor (pixel_width - NAME_X_OFFSET), NAME_FONT, width); - if (ustr.empty()) { - - name_text->hide (); - - } else { - - /* don't use name for event handling if it leaves no room - for trimming to work. - */ + int limit = (int) floor (pixel_width - NAME_X_OFFSET); + bool shrinking = (last_name_text_width > pixel_width); + int actual_width; + ustring ustr; + ustring::size_type n; + + if ((last_name_text_width && // we did this once + shrinking && // we're getting smaller + (name_text_width <= limit) && // fits the new size + (name_text_width <= last_name_text_width - NAME_X_OFFSET))) { // fit into the old size too + last_name_text_width = pixel_width; + return; + } + + /* now check the cache of existing truncations */ + + Gtk::Label foo; + Glib::RefPtr layout = foo.create_pango_layout (""); + + for (n = item_name.length(); n > 0; --n) { - if (pixel_width - width < (NAME_X_OFFSET * 2.0)) { - if (name_connected) { - name_connected = false; + map::iterator i; + + if ((i = name_text_size_cache.find (n)) != name_text_size_cache.end()) { + + /* we know the length of this substring already */ + + if ((actual_width = (*i).second) < limit) { + + /* it fits, use it */ + + ustr = item_name.substr (0, n); + break; } + } else { - if (!name_connected) { - name_connected = true; + + /* we don't know the length of this substring already, so compute + it and put it into the cache. + */ + + layout->set_text (item_name.substr (0, n)); + + int width, height; + Gtkmm2ext::get_ink_pixel_size (layout, width, height); + + name_text_size_cache[n] = width; + + if ((actual_width = width) < limit) { + ustr = item_name.substr (0, n); + break; } } - - name_text->property_text() = ustr; - name_text->show(); } + + if (n == 0) { + name_text->property_text() = ""; + last_name_text_width = pixel_width; + return; + } + + /* don't use name for event handling if it leaves no room + for trimming to work. + */ + + if (pixel_width - actual_width < (NAME_X_OFFSET * 2.0)) { + if (name_connected) { + name_connected = false; + } + } else { + if (!name_connected) { + name_connected = true; + } + } + + name_text->property_text() = ustr; + name_text_width = actual_width; + name_text->show(); + last_name_text_width = pixel_width; + }