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/input.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/input.cpp')
| -rw-r--r-- | src/dialogs/input.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/dialogs/input.cpp b/src/dialogs/input.cpp index eac3a0c5a..8d6ff399d 100644 --- a/src/dialogs/input.cpp +++ b/src/dialogs/input.cpp @@ -5,8 +5,9 @@ * * Authors: * Nicklas Lindgren <nili@lysator.liu.se> + * Johan Engelen <goejendaagh@zonnet.nl> * - * Copyright (C) 2005 Authors + * Copyright (C) 2005-2006 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -27,6 +28,7 @@ #include "dialog-events.h" #include "../prefs-utils.h" +#define MIN_ONSCREEN_DISTANCE 50 static GtkWidget *dlg = NULL; static win_data wd; @@ -221,8 +223,8 @@ sp_input_dialog (void) dlg = gtk_input_dialog_new(); 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) { @@ -230,18 +232,18 @@ 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) 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; |