diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2013-05-01 06:17:45 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2013-05-01 06:17:45 +0000 |
| commit | c96a7e7b0dc1944280a3807ce47aca285b956b89 (patch) | |
| tree | e124b820fe6f2c57ceb6b211c9a6cf636e1a19f1 /src/sp-namedview.cpp | |
| parent | Fix for Bug #629081 (Spiro and path operations fails) by Matthew Petroff. (diff) | |
| download | inkscape-c96a7e7b0dc1944280a3807ce47aca285b956b89.tar.gz inkscape-c96a7e7b0dc1944280a3807ce47aca285b956b89.zip | |
Fix for Bug #830663 (default window size is too small) by Jiabao Wu
Fixed bugs:
- https://launchpad.net/bugs/830663
(bzr r12315)
Diffstat (limited to 'src/sp-namedview.cpp')
| -rw-r--r-- | src/sp-namedview.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index f417dd275..91ad00cf4 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -8,7 +8,7 @@ * Abhishek Sharma * * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl> - * Copyright (C) 1999-2008 Authors + * Copyright (C) 1999-2013 Authors * Copyright (C) 2000-2001 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information @@ -764,11 +764,13 @@ void sp_namedview_window_from_document(SPDesktop *desktop) SPNamedView *nv = desktop->namedview; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); bool geometry_from_file = (1 == prefs->getInt("/options/savewindowgeometry/value", 0)); + gint default_geometry = prefs->getInt("/options/defaultwindowsize/value", 1); + bool new_document = !(nv->window_width > 0) || !(nv->window_height > 0); bool show_dialogs = TRUE; // restore window size and position stored with the document if (geometry_from_file) { - if (nv->window_maximized) { + if (nv->window_maximized || (new_document && (default_geometry == 2))) { Gtk::Window *win = desktop->getToplevel(); if (win){ win->maximize(); @@ -783,7 +785,6 @@ void sp_namedview_window_from_document(SPDesktop *desktop) x = MAX(MIN_ONSCREEN_DISTANCE - nv->window_width, x); y = MAX(MIN_ONSCREEN_DISTANCE - nv->window_height, y); if (w>0 && h>0) { - #ifndef WIN32 gint dx, dy, dw, dh; desktop->getWindowGeometry(dx, dy, dw, dh); @@ -796,10 +797,16 @@ void sp_namedview_window_from_document(SPDesktop *desktop) desktop->setWindowSize(w, h); desktop->setWindowPosition(Geom::Point(x, y)); - + } else { + if (default_geometry == 1) { + w = gdk_screen_width() * 0.75; + h = gdk_screen_height() * 0.75; + desktop->setWindowSize(w, h); + desktop->setWindowPosition(Geom::Point(x, y)); + } } - } + } } // restore zoom and view |