diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-11 17:40:03 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-11 17:40:03 +0000 |
| commit | 3b80081f5a6a0b3ad870d5e90037189e56c9468f (patch) | |
| tree | 3de07a42745f10892ae2eca52c1cf3fb49421301 /src/widgets/desktop-widget.cpp | |
| parent | merge from trunk (r12182) (diff) | |
| parent | fix build warnings / cppcheck ( Bug #1120585 ) (diff) | |
| download | inkscape-3b80081f5a6a0b3ad870d5e90037189e56c9468f.tar.gz inkscape-3b80081f5a6a0b3ad870d5e90037189e56c9468f.zip | |
merge from trunk (r12191)
(bzr r11668.1.55)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index b0d8d974e..4af7c0795 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -357,6 +357,11 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->panels = new SwatchesPanel("/embedded/swatches"); dtw->panels->setOrientation(SP_ANCHOR_SOUTH); + +#if GTK_CHECK_VERSION(3,0,0) + dtw->panels->set_vexpand(false); +#endif + gtk_box_pack_end( GTK_BOX( dtw->vbox ), GTK_WIDGET(dtw->panels->gobj()), FALSE, TRUE, 0 ); } |