diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2006-11-27 15:01:13 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2006-11-27 15:01:13 +0000 |
| commit | 0e57fb789795266c3fcb7d82a355028a0233b83b (patch) | |
| tree | 946439234371cb16b10c2e697e5251689d12c328 /src/dialogs/xml-tree.cpp | |
| parent | fixed temporary files management in eqtexsvg extension (diff) | |
| download | inkscape-0e57fb789795266c3fcb7d82a355028a0233b83b.tar.gz inkscape-0e57fb789795266c3fcb7d82a355028a0233b83b.zip | |
non-gtkmm dialogs are now always opened ON-screen
(bzr r2045)
Diffstat (limited to 'src/dialogs/xml-tree.cpp')
| -rw-r--r-- | src/dialogs/xml-tree.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp index b84381989..3402e72b5 100644 --- a/src/dialogs/xml-tree.cpp +++ b/src/dialogs/xml-tree.cpp @@ -7,8 +7,9 @@ * Lauris Kaplinski <lauris@kaplinski.com> * MenTaLguY <mental@rydia.net> * bulia byak <buliabyak@users.sf.net> + * Johan Engelen <goejendaagh@zonnet.nl> * - * Copyright (C) 1999-2005 Authors + * Copyright (C) 1999-2006 Authors * Copyright (C) 2004 David Turner * * Released under GNU GPL, read the file 'COPYING' for more information @@ -63,6 +64,8 @@ #include "message-stack.h" #include "message-context.h" +#define MIN_ONSCREEN_DISTANCE 50 + struct EditableDest { GtkEditable *editable; gchar *text; @@ -210,26 +213,26 @@ void sp_xml_tree_dialog() dlg = sp_window_new("", TRUE); if (x == -1000 || y == -1000) { - x = prefs_get_int_attribute(prefs_path, "x", 0); - y = prefs_get_int_attribute(prefs_path, "y", 0); + x = prefs_get_int_attribute(prefs_path, "x", -1000); + y = prefs_get_int_attribute(prefs_path, "y", -1000); } if (w ==0 || h == 0) { 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) x=0; +// if (y<0) y=0; - if (x != 0 || y != 0) { + if (w && h) { + gtk_window_resize((GtkWindow *) dlg, w, h); + } + if (x >= 0 && y >= 0 && (x < (gdk_screen_width()-MIN_ONSCREEN_DISTANCE)) && (y < (gdk_screen_height()-MIN_ONSCREEN_DISTANCE))) { gtk_window_move((GtkWindow *) dlg, x, y); } else { gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER); } - if (w && h) { - gtk_window_resize((GtkWindow *) dlg, w, h); - } sp_transientize(dlg); wd.win = dlg; wd.stop = 0; |