make sure only positive dialog positions are read from preferences, fixes #1290647

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index afe9cd77f5b30430aab817a2198e1dcc5f798f0d..304bf7c0ee3e5c34141b226a37325fc5ed6113bd 100644 (file)
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -1583,6 +1583,9 @@ clonetiler_dialog (void)
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
         
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         

diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 6cd1084124f08f25e885acb2492301cf4b982852..54df647829f8a16c95cb8140e90f7108dad8988a 100644 (file)
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -348,6 +348,9 @@ sp_export_dialog (void)
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
 
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {

diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index c1f1c9974c53de30c48b48c0e29ad5240d86afc9..c76390ccba5a7c164a43fdd3a6df4f0490cdb2f3 100644 (file)
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -652,6 +652,10 @@ sp_find_dialog_old (void)
             w = prefs_get_int_attribute (prefs_path, "w", 0);
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
+        
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {

diff --git a/src/dialogs/input.cpp b/src/dialogs/input.cpp
index be6a0054288bfec50e18c40a32d08065215d1fcf..eac3a0c5a549b794aa8dde82491792dfba80aa7c 100644 (file)
--- a/src/dialogs/input.cpp
+++ b/src/dialogs/input.cpp
@@ -230,6 +230,9 @@ sp_input_dialog (void)
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
 
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {

diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index da5f7a00c643ab340eb350ec461bc88bd3327a1c..50027e2faaf9c01022204a872d31f14620b48bc0 100644 (file)
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -455,6 +455,9 @@ sp_item_dialog (void)
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
 
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {

diff --git a/src/dialogs/object-properties.cpp b/src/dialogs/object-properties.cpp
index f571c75ebe985efbf49dd8d065117ccb5f3fe240..f4a40cd28a56b5320584874cba865b389f57ec96 100644 (file)
--- a/src/dialogs/object-properties.cpp
+++ b/src/dialogs/object-properties.cpp
@@ -122,6 +122,10 @@ sp_object_properties_dialog (void)
             w = prefs_get_int_attribute (prefs_path, "w", 0);
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
+        
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0)
             gtk_window_move ((GtkWindow *) dlg, x, y);
         else

diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 136cb823d8f7238fcf3262c2c4ac24e005893b55..9d8fe5cedd955e241dc7049c885c4cfcc8459b6f 100644 (file)
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -154,6 +154,9 @@ sp_text_edit_dialog (void)
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
 
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {

diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index 60845b6bb96f1bb0edd2d6f301013801968df87b..44426d9215a6843afb7c69eab88526d9fec691c4 100644 (file)
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -217,6 +217,10 @@ void sp_xml_tree_dialog()
             w = prefs_get_int_attribute(prefs_path, "w", 0);
             h = prefs_get_int_attribute(prefs_path, "h", 0);
         }
+        
+        if (x<0) x=0;
+        if (y<0) y=0;
+
         if (x != 0 || y != 0) {
             gtk_window_move((GtkWindow *) dlg, x, y);
         } else {

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 84e69ee24317ce606a9f55409caba497042c5de1..238c6d9f7675702cc5d71ed7c36e024c86dd3cd3 100644 (file)
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -97,6 +97,9 @@ Dialog::read_geometry()
 
 //    g_print ("read %d %d %d %d\n", x, y, w, h);
 
+        if (x<0) x=0;
+        if (y<0) y=0;
+
     // If there are stored height and width values for the dialog,
     // resize the window to match; otherwise we leave it at its default
     if (w != 0 && h != 0) {

diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 15c19da0eaec1532b42036f5435f0ded365e1fa3..2917ab89d0d379c9bc34cc4fb551b2e3199ace9f 100644 (file)
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -878,6 +878,10 @@ sp_gradient_vector_editor_new (SPGradient *gradient, SPStop *stop)
                        w = prefs_get_int_attribute (prefs_path, "w", 0);
                        h = prefs_get_int_attribute (prefs_path, "h", 0);
                }
+
+                if (x<0) x=0;
+                if (y<0) y=0;
+
                if (x != 0 || y != 0)
                        gtk_window_move ((GtkWindow *) dlg, x, y);
                else