Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

[X11] Fixed showing window in fullscreen with XFCE.

Browse Source 
Closes #648
This commit is contained in:
nowrep 2013-02-11 17:58:05 +01:00
parent bea5f72ad7
commit e069da55e3
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -28,6 +28,7 @@ Version 1.4.0
* fixed qvalue format in Accept-Language HTTP header * fixed qvalue format in Accept-Language HTTP header
* fixed sorting files case insensitively in file scheme handler * fixed sorting files case insensitively in file scheme handler
* fixed possible crash in saving page screen of a really long page * 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 * X11: fixed Ctrl+Q shortcut for DEs other than KDE and Gnome
* windows: improved installer allows registering as default web browser * windows: improved installer allows registering as default web browser
* windows: check and set as default browser from preferences * windows: check and set as default browser from preferences

6
src/lib/app/qupzilla.cpp
View File

@ -1735,7 +1735,8 @@ void QupZilla::fullScreen(bool make)
m_menuBarVisible = menuBar()->isVisible(); m_menuBarVisible = menuBar()->isVisible();
m_statusBarVisible = statusBar()->isVisible(); m_statusBarVisible = statusBar()->isVisible();
setWindowState(windowState() | Qt::WindowFullScreen); m_windowStates = windowState();
showFullScreen();
menuBar()->hide(); menuBar()->hide();
statusBar()->hide(); statusBar()->hide();
@ -1754,7 +1755,8 @@ void QupZilla::fullScreen(bool make)
#endif #endif
} }
else { else {
setWindowState(windowState() & ~Qt::WindowFullScreen); showNormal();
setWindowState(m_windowStates);
menuBar()->setVisible(m_menuBarVisible); menuBar()->setVisible(m_menuBarVisible);
statusBar()->setVisible(m_statusBarVisible); statusBar()->setVisible(m_statusBarVisible);

1
src/lib/app/qupzilla.h
View File

@ -327,6 +327,7 @@ private:
// Used for F11 FullScreen remember visibility of menubar and statusbar // Used for F11 FullScreen remember visibility of menubar and statusbar
bool m_menuBarVisible; bool m_menuBarVisible;
bool m_statusBarVisible; bool m_statusBarVisible;
Qt::WindowStates m_windowStates;
QTimer* m_hideNavigationTimer; QTimer* m_hideNavigationTimer;
QList<QPointer<QWidget> > m_deleteOnCloseWidgets; QList<QPointer<QWidget> > m_deleteOnCloseWidgets;