Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

BrowserWindow: Restore window states last when leaving fullscreen

Browse Source
This commit is contained in:
David Rosca 2017-01-20 09:37:00 +01:00
parent 3274634539
commit f15643b454
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/app/browserwindow.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -1123,12 +1123,10 @@ bool BrowserWindow::event(QEvent* event)
statusBar()->hide(); statusBar()->hide();
m_navigationContainer->hide(); m_navigationContainer->hide();
m_navigationToolbar->buttonExitFullscreen()->setVisible(true); m_navigationToolbar->buttonExitFullscreen()->show();
} }
else if (ev->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) { else if (ev->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {
// Leave fullscreen // Leave fullscreen
setWindowState(m_windowStates);
statusBar()->setVisible(m_statusBarVisible); statusBar()->setVisible(m_statusBarVisible);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
menuBar()->setVisible(m_menuBarVisible); menuBar()->setVisible(m_menuBarVisible);
@ -1136,8 +1134,10 @@ bool BrowserWindow::event(QEvent* event)
m_navigationContainer->show(); m_navigationContainer->show();
m_navigationToolbar->setSuperMenuVisible(!m_menuBarVisible); m_navigationToolbar->setSuperMenuVisible(!m_menuBarVisible);
m_navigationToolbar->buttonExitFullscreen()->setVisible(false); m_navigationToolbar->buttonExitFullscreen()->hide();
m_isHtmlFullScreen = false; m_isHtmlFullScreen = false;
setWindowState(m_windowStates);
} }
if (m_hideNavigationTimer) { if (m_hideNavigationTimer) {