ardour/livetrax
13
0
Fork 0
Code

wash that pango right out of your hair

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1668 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-04-05 21:56:32 +00:00
parent 100e6981fb
commit 6bd31cc7a3
3 changed files with 73 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/canvas-waveview.c
View File

@ -1202,7 +1202,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
unsigned char zero_r, zero_g, zero_b, zero_a;
UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a );
int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, zend, zeroline_y);
PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, end, zeroline_y);
}
#undef origin

94
gtk2_ardour/time_axis_view_item.cc
View File

@ -559,8 +559,9 @@ void
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 ();
}
}
@ -918,42 +919,87 @@ TimeAxisViewItem::reset_name_width (double pixel_width)
return;
}
if ((last_name_text_width && // we did this once
(name_text_width <= pixel_width - NAME_X_OFFSET) && // fits the new size
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;
}
int width;
ustring ustr = fit_to_pixels (item_name, (int) floor (pixel_width - NAME_X_OFFSET), NAME_FONT, width);
if (ustr.empty()) {
/* now check the cache of existing truncations */
Gtk::Label foo;
Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
for (n = item_name.length(); n > 0; --n) {
name_text->hide ();
} else {
/* don't use name for event handling if it leaves no room
for trimming to work.
*/
if (pixel_width - width < (NAME_X_OFFSET * 2.0)) {
if (name_connected) {
name_connected = false;
map<ustring::size_type,int>::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) {
/* nothing will fit */
name_text->hide ();
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;
}

2
gtk2_ardour/time_axis_view_item.h
View File

@ -464,6 +464,8 @@ class TimeAxisViewItem : public Selectable
int name_text_width;
double last_name_text_width;
std::map<Glib::ustring::size_type,int> name_text_size_cache;
Visibility visibility;
}; /* class TimeAxisViewItem */