From 59d3fa47a5e5247b7af1dd2559193126b367d8ad Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Sun, 16 Dec 2012 12:54:15 -0500
Subject: [PATCH 1/2] fix restoring previously maximized window from tray

---
 src/fe-gtk/maingui.c     | 8 ++++----
 src/fe-gtk/plugin-tray.c | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index e5f79abd..ff8f6d69 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -498,10 +498,6 @@ fe_set_title (session *sess)
 static gboolean
 mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata)
 {
-	prefs.hex_gui_win_state = 0;
-	if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
-		prefs.hex_gui_win_state = 1;
-
 	if ((event->changed_mask & GDK_WINDOW_STATE_ICONIFIED) &&
 		 (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) &&
 		 prefs.hex_gui_tray_minimize && !hextray_mode ())
@@ -510,6 +506,10 @@ mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata
 		gtk_window_deiconify (wid);
 	}
 
+	prefs.hex_gui_win_state = 0;
+	if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
+		prefs.hex_gui_win_state = 1;
+
 	return FALSE;
 }
 
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index 07207a99..e77bf95c 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -372,6 +372,7 @@ tray_toggle_visibility (gboolean force_hide)
 {
 	static int x, y;
 	static GdkScreen *screen;
+	static int maximized;
 	GtkWindow *win;
 
 	if (!sticon)
@@ -396,14 +397,18 @@ tray_toggle_visibility (gboolean force_hide)
 	{
 		gtk_window_get_position (win, &x, &y);
 		screen = gtk_window_get_screen (win);
+		maximized = prefs.hex_gui_win_state;
 		gtk_widget_hide (GTK_WIDGET (win));
 	}
 	else
 	{
 		gtk_window_set_screen (win, screen);
 		gtk_window_move (win, x, y);
+		if (maximized)
+			gtk_window_maximize (win);
 		gtk_widget_show (GTK_WIDGET (win));
 		gtk_window_present (win);
+
 	}
 
 	return TRUE;

From 52ffb02685d922696497e17f22fd15b3dc5b3916 Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Thu, 20 Dec 2012 13:30:48 -0500
Subject: [PATCH 2/2] Update src/fe-gtk/plugin-tray.c

---
 src/fe-gtk/plugin-tray.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index e77bf95c..294920da 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -408,7 +408,6 @@ tray_toggle_visibility (gboolean force_hide)
 			gtk_window_maximize (win);
 		gtk_widget_show (GTK_WIDGET (win));
 		gtk_window_present (win);
-
 	}
 
 	return TRUE;