summaryrefslogtreecommitdiffstats
path: root/src/widgets/desktop-widget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
-rw-r--r--src/widgets/desktop-widget.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 6550ca0cd..5904ccc79 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -314,10 +314,9 @@ sp_desktop_widget_init (SPDesktopWidget *dtw)
{
using Inkscape::UI::Dialogs::SwatchesPanel;
- SwatchesPanel* swatches = new SwatchesPanel("/embedded/swatches");
- swatches->setOrientation( Gtk::ANCHOR_SOUTH );
- dtw->panels = GTK_WIDGET(swatches->gobj());
- gtk_box_pack_end( GTK_BOX( dtw->vbox ), dtw->panels, FALSE, TRUE, 0 );
+ dtw->panels = new SwatchesPanel("/embedded/swatches");
+ dtw->panels->setOrientation( Gtk::ANCHOR_SOUTH );
+ gtk_box_pack_end( GTK_BOX( dtw->vbox ), GTK_WIDGET(dtw->panels->gobj()), FALSE, TRUE, 0 );
}
hbox = gtk_hbox_new (FALSE, 0);
@@ -1244,9 +1243,9 @@ sp_desktop_widget_layout (SPDesktopWidget *dtw)
}
if (!prefs->getBool(pref_root + "panels/state", true)) {
- gtk_widget_hide_all( dtw->panels );
+ gtk_widget_hide_all( GTK_WIDGET(dtw->panels->gobj()) );
} else {
- gtk_widget_show_all( dtw->panels );
+ gtk_widget_show_all( GTK_WIDGET(dtw->panels->gobj()) );
}
if (!prefs->getBool(pref_root + "scrollbars/state", true)) {
@@ -1362,6 +1361,8 @@ sp_desktop_widget_new (SPNamedView *namedview)
sp_commands_toolbox_set_desktop (dtw->commands_toolbox, dtw->desktop);
sp_snap_toolbox_set_desktop (dtw->snap_toolbox, dtw->desktop);
+ dtw->panels->setDesktop( dtw->desktop );
+
return SP_VIEW_WIDGET (dtw);
}