patch 1690246 from Max + read_geometry fixes for consistent placement

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 64109de3fa2f6c24d04048805b54646a487b8f3f..ac147d65652230b5fbf53e55f01206de641ade64 100644 (file)
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -66,6 +66,7 @@ sp_dialog_shutdown (GtkObject *object, gpointer dlgPtr)
 void 
 Dialog::present()
 {
+    _user_hidden = false;
     Gtk::Dialog::present();
 }
 

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 6eb74214a0f619d1bc9fb12ccca6590cdd43bf71..28e0084861f29e037d530e451dfa00b7a9d6d6ea 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -129,12 +129,13 @@ static void show_panel( Inkscape::UI::Widget::Panel &panel, char const *prefs_pa
         Gtk::VBox *mainVBox = dia->get_vbox();
         mainVBox->pack_start(panel);
         dia->show_all_children();
-        dia->present();
         dia->read_geometry();
+        dia->present();
     } else {
-        Gtk::Dialog *dia = dynamic_cast<Gtk::Dialog*>(container);
+        PanelDialog *dia = dynamic_cast<PanelDialog*>(container);
         if ( dia ) {
             //g_message("Found an existing dialog");
+            dia->read_geometry();
             dia->present();
         } else {
             g_message("Failed to find an existing dialog");