mark the step entry dialog as a dialog even though it is an ArdourWindow, to help...

[ardour.git] / gtk2_ardour / time_axis_view_item.cc

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 0f184c1da7b297389864b9ad9b092008a61318ff..2b20b3c45e6db337c401003aafa25fbb87ebb7bd 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -328,7 +328,9 @@ bool
 TimeAxisViewItem::set_duration (framecnt_t dur, void* src)
 {
        if ((dur > max_item_duration) || (dur < min_item_duration)) {
-               warning << string_compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
+               warning << string_compose (
+                               P_("new duration %1 frame is out of bounds for %2", "new duration of %1 frames is out of bounds for %2", dur),
+                               get_item_name(), dur)
                        << endmsg;
                return false;
        }
@@ -916,9 +918,12 @@ TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
        }
 
        update_name_pixbuf_visibility ();
-       if (pb_width > 0) {
-               name_pixbuf->property_pixbuf() = pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
+
+       if (pb_width < 1) {
+               pb_width = 1;
        }
+
+       name_pixbuf->property_pixbuf() = pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
 }
 
 /**