diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2005-07-06 23:05:39 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-07-06 23:05:39 (GMT) |
commit | 02383ed04e6a5c215d6d3d4b961bc73b58a23b37 (patch) | |
tree | 086f2170e92faa6e5e6618f0a847655b00b94bce /shell/ev-window.c | |
parent | 6a456fd7b243b73177b1f9ddf9eddc315295b11a (diff) |
This should solve the circular dep without requiring dir reorg!
2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
* Makefile.am:
* backend/Makefile.am:
* properties/Makefile.am:
* shell/Makefile.am:
* thumbnailer/Makefile.am:
This should solve the circular dep without
requiring dir reorg!
* shell/ev-window.c: (setup_view_from_metadata):
Never restore window size/position when the
window is already visible.
Diffstat (limited to 'shell/ev-window.c')
-rw-r--r-- | shell/ev-window.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index d7bfa77..4f737b4 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -955,12 +955,17 @@ setup_view_from_metadata (EvWindow *window) GValue fullscreen = { 0, }; /* Window size */ - if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) { - if (g_value_get_boolean (&maximized) && !GTK_WIDGET_VISIBLE (window)) { - gtk_window_maximize (GTK_WINDOW (window)); + if (!GTK_WIDGET_VISIBLE (window)) { + gboolean restore_size = TRUE; + + if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) { + if (g_value_get_boolean (&maximized)) { + gtk_window_maximize (GTK_WINDOW (window)); + restore_size = FALSE; + } } - if (!g_value_get_boolean (&maximized) && + if (restore_size && ev_metadata_manager_get (uri, "window_x", &x) && ev_metadata_manager_get (uri, "window_y", &y) && ev_metadata_manager_get (uri, "window_width", &width) && |