make sure no negative dialog position is written into preferences,

part of fix for #1290647

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 084186bf6c6cc6609954d4b6379ec79d359e95f2..afe9cd77f5b30430aab817a2198e1dcc5f798f0d 100644 (file)
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -112,6 +112,9 @@ clonetiler_dialog_delete (GtkObject *object, GdkEvent * /*event*/, gpointer data
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (prefs_path, "x", x);
     prefs_set_int_attribute (prefs_path, "y", y);
     prefs_set_int_attribute (prefs_path, "w", w);

diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 42a084dde51cf4e3a34084619e9f490e00f977e8..6cd1084124f08f25e885acb2492301cf4b982852 100644 (file)
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -147,6 +147,9 @@ sp_export_dialog_delete ( GtkObject *object, GdkEvent *event, gpointer data )
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (prefs_path, "x", x);
     prefs_set_int_attribute (prefs_path, "y", y);
     prefs_set_int_attribute (prefs_path, "w", w);

diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index 85146f8a30db5076ad0a7e3ce1f65014e6ee22c1..c1f1c9974c53de30c48b48c0e29ad5240d86afc9 100644 (file)
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -93,6 +93,9 @@ static gboolean sp_find_dialog_delete(GtkObject *, GdkEvent *, gpointer data)
     gtk_window_get_position (GTK_WINDOW (dlg), &x, &y);
     gtk_window_get_size (GTK_WINDOW (dlg), &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (prefs_path, "x", x);
     prefs_set_int_attribute (prefs_path, "y", y);
     prefs_set_int_attribute (prefs_path, "w", w);

diff --git a/src/dialogs/input.cpp b/src/dialogs/input.cpp
index 501a4a21bea616eb3bc1bd97ab87e79d94cf5a05..be6a0054288bfec50e18c40a32d08065215d1fcf 100644 (file)
--- a/src/dialogs/input.cpp
+++ b/src/dialogs/input.cpp
@@ -49,6 +49,9 @@ sp_input_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (prefs_path, "x", x);
     prefs_set_int_attribute (prefs_path, "y", y);
     prefs_set_int_attribute (prefs_path, "w", w);

diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index 7a9b37dcf3acbeb1ad55c98ac3de9f54fe9ea231..da5f7a00c643ab340eb350ec461bc88bd3327a1c 100644 (file)
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -70,6 +70,9 @@ sp_item_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (prefs_path, "x", x);
     prefs_set_int_attribute (prefs_path, "y", y);
     prefs_set_int_attribute (prefs_path, "w", w);

diff --git a/src/dialogs/object-properties.cpp b/src/dialogs/object-properties.cpp
index 9cbf1c3ea71a87001f8b462aa206aa62cf212aa6..f571c75ebe985efbf49dd8d065117ccb5f3fe240 100644 (file)
--- a/src/dialogs/object-properties.cpp
+++ b/src/dialogs/object-properties.cpp
@@ -68,6 +68,9 @@ sp_object_properties_dialog_delete ( GtkObject *object,
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (prefs_path, "x", x);
     prefs_set_int_attribute (prefs_path, "y", y);
     prefs_set_int_attribute (prefs_path, "w", w);

diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 8de2dedac5b01f4b784c50428c730258856e7213..136cb823d8f7238fcf3262c2c4ac24e005893b55 100644 (file)
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -100,6 +100,9 @@ sp_text_edit_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (prefs_path, "x", x);
     prefs_set_int_attribute (prefs_path, "y", y);
     prefs_set_int_attribute (prefs_path, "w", w);

diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index fe51f014469e79174d9ad6bd3f5f6b75c892f7a9..60845b6bb96f1bb0edd2d6f301013801968df87b 100644 (file)
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -913,6 +913,9 @@ static gboolean on_delete(GtkObject *object, GdkEvent *event, gpointer data)
     gtk_window_get_position((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size((GtkWindow *) dlg, &w, &h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute(prefs_path, "x", x);
     prefs_set_int_attribute(prefs_path, "y", y);
     prefs_set_int_attribute(prefs_path, "w", w);

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index b4e491bf960bd81dbc007f1072559416722a6d1e..84e69ee24317ce606a9f55409caba497042c5de1 100644 (file)
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -76,6 +76,9 @@ Dialog::save_geometry()
 
 //    g_print ("write %d %d %d %d\n", x, y, w, h);
 
+    if (x<0) x=0;
+    if (y<0) y=0;
+
     prefs_set_int_attribute (_prefs_path, "x", x);
     prefs_set_int_attribute (_prefs_path, "y", y);
     prefs_set_int_attribute (_prefs_path, "w", w);