From e069da55e36e2984cbf2a5b000dba69a1884c4f7 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 11 Feb 2013 17:58:05 +0100
Subject: [PATCH] [X11] Fixed showing window in fullscreen with XFCE.

Closes #648
---
 CHANGELOG                | 1 +
 src/lib/app/qupzilla.cpp | 6 ++++--
 src/lib/app/qupzilla.h   | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dbdb68b64..ad274473b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ Version 1.4.0
     * fixed qvalue format in Accept-Language HTTP header
     * fixed sorting files case insensitively in file scheme handler
     * fixed possible crash in saving page screen of a really long page
+    * fixed showing window in fullscreen with XFCE
     * X11: fixed Ctrl+Q shortcut for DEs other than KDE and Gnome
     * windows: improved installer allows registering as default web browser
     * windows: check and set as default browser from preferences
diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp
index 60f3e8035..5ef387eb9 100644
--- a/src/lib/app/qupzilla.cpp
+++ b/src/lib/app/qupzilla.cpp
@@ -1735,7 +1735,8 @@ void QupZilla::fullScreen(bool make)
         m_menuBarVisible = menuBar()->isVisible();
         m_statusBarVisible = statusBar()->isVisible();
 
-        setWindowState(windowState() | Qt::WindowFullScreen);
+        m_windowStates = windowState();
+        showFullScreen();
 
         menuBar()->hide();
         statusBar()->hide();
@@ -1754,7 +1755,8 @@ void QupZilla::fullScreen(bool make)
 #endif
     }
     else {
-        setWindowState(windowState() & ~Qt::WindowFullScreen);
+        showNormal();
+        setWindowState(m_windowStates);
 
         menuBar()->setVisible(m_menuBarVisible);
         statusBar()->setVisible(m_statusBarVisible);
diff --git a/src/lib/app/qupzilla.h b/src/lib/app/qupzilla.h
index 1e05bd731..b6b1ae152 100644
--- a/src/lib/app/qupzilla.h
+++ b/src/lib/app/qupzilla.h
@@ -327,6 +327,7 @@ private:
     // Used for F11 FullScreen remember visibility of menubar and statusbar
     bool m_menuBarVisible;
     bool m_statusBarVisible;
+    Qt::WindowStates m_windowStates;
     QTimer* m_hideNavigationTimer;
 
     QList<QPointer<QWidget> > m_deleteOnCloseWidgets;