diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-09-27 06:53:55 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-09-27 06:53:55 +0000 |
| commit | 828e688406ed359ad15ed4afc6d048e1cfc1a7b9 (patch) | |
| tree | b5a88fb57c5b7bfc7133cf0db3b6cef8aa587ac6 /src/ui/widget/layer-selector.cpp | |
| parent | fix for 'em' and 'ex' units support (diff) | |
| parent | Fix for 166691 : Changing layer order does not update layer selector (diff) | |
| download | inkscape-828e688406ed359ad15ed4afc6d048e1cfc1a7b9.tar.gz inkscape-828e688406ed359ad15ed4afc6d048e1cfc1a7b9.zip | |
merge from trunk (r11709)
(bzr r11668.1.19)
Diffstat (limited to 'src/ui/widget/layer-selector.cpp')
| -rw-r--r-- | src/ui/widget/layer-selector.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index a80a1aba0..c06f70185 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 { @@ -239,7 +240,9 @@ private: void LayerSelector::_layersChanged() { - //_selectLayer(_desktop->currentLayer()); + if (_desktop) { + _selectLayer(_desktop->currentLayer()); + } } /** Selects the given layer in the dropdown selector. @@ -579,7 +582,7 @@ void LayerSelector::_prepareLabelRenderer( gchar const *label; if ( object != root ) { label = object->label(); - if (!label) { + if (!object->label()) { label = object->defaultLabel(); label_defaulted = true; } @@ -587,7 +590,7 @@ void LayerSelector::_prepareLabelRenderer( label = _("(root)"); } - gchar *text = g_markup_printf_escaped(format, label); + gchar *text = g_markup_printf_escaped(format, gr_ellipsize_text (label, 50).c_str()); _label_renderer.property_markup() = text; g_free(text); g_free(format); @@ -599,6 +602,7 @@ void LayerSelector::_prepareLabelRenderer( _label_renderer.property_style() = ( label_defaulted ? Pango::STYLE_ITALIC : Pango::STYLE_NORMAL ); + } void LayerSelector::_lockLayer(bool lock) { |