Limit Win32 taskbar workaround to size state changes

src/fe-gtk/maingui.c

@@ -1003,7 +1003,9 @@ mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata
                 menu_set_fullscreen (current_sess->gui, prefs.hex_gui_win_fullscreen);
 
 #ifdef G_OS_WIN32
-	mg_win32_allow_autohide_taskbar (wid, event);
+	if (event->changed_mask &
+	    (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))
+		mg_win32_allow_autohide_taskbar (wid, event);
 #endif
 
         return FALSE;

src/fe-gtk/plugin-tray.c

@@ -855,7 +855,6 @@ tray_toggle_visibility (gboolean force_hide)
 	static int maximized;
 	static int fullscreen;
 	GtkWindow *win;
-	WinStatus status;
 
 	if (!tray_backend_active)
 		return FALSE;
@@ -871,9 +870,7 @@ tray_toggle_visibility (gboolean force_hide)
 	if (!win)
 		return FALSE;
 
-	status = tray_get_window_status ();
-
-	if (force_hide || status != WS_HIDDEN)
+	if (force_hide || gtk_widget_get_visible (GTK_WIDGET (win)))
 	{
 		if (prefs.hex_gui_tray_away)
 			zoitechat_command (ph, "ALLSERV AWAY");
@@ -893,8 +890,8 @@ tray_toggle_visibility (gboolean force_hide)
 			gtk_window_maximize (win);
 		if (fullscreen)
 			gtk_window_fullscreen (win);
-		gtk_window_deiconify (win);
 		gtk_widget_show (GTK_WIDGET (win));
+		gtk_window_deiconify (win);
 		gtk_window_present (win);
 	}