From 854c6d935cecf2512f4062c8ca0a236c8a22759e Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 26 Sep 2012 12:16:46 +0900 Subject: Fix for 169001 : Long layer names mess with the UI (bzr r11705) --- src/ui/widget/layer-selector.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/ui/widget/layer-selector.cpp') diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index a80a1aba0..4bb4d8c98 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -34,6 +34,7 @@ #include "widgets/icon.h" #include "widgets/shrink-wrap-button.h" #include "xml/node-event-vector.h" +#include "widgets/gradient-vector.h" namespace Inkscape { namespace Widgets { @@ -578,8 +579,8 @@ void LayerSelector::_prepareLabelRenderer( gchar const *label; if ( object != root ) { - label = object->label(); - if (!label) { + label = gr_ellipsize_text (object->label(), 50).c_str(); + if (!object->label()) { label = object->defaultLabel(); label_defaulted = true; } @@ -599,6 +600,7 @@ void LayerSelector::_prepareLabelRenderer( _label_renderer.property_style() = ( label_defaulted ? Pango::STYLE_ITALIC : Pango::STYLE_NORMAL ); + } void LayerSelector::_lockLayer(bool lock) { -- cgit v1.2.3