From 02383ed04e6a5c215d6d3d4b961bc73b58a23b37 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 06 Jul 2005 23:05:39 +0000 Subject: This should solve the circular dep without requiring dir reorg! 2005-07-07 Marco Pesenti Gritti * 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. --- (limited to 'shell/ev-window.c') 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) && -- cgit v0.9.1