Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

BrowserWindow: Fix failing to enter fullscreen sometimes

Browse Source
This commit is contained in:
David Rosca 2017-08-19 18:52:26 +02:00
parent f3367e7611
commit 5812721e48
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -683,6 +683,15 @@ void BrowserWindow::showSource(WebView *view)
view->showSource();
}
void BrowserWindow::showNormal()
{
if (m_normalWindowState & Qt::WindowMaximized) {
QMainWindow::showMaximized();
} else {
QMainWindow::showNormal();
}
}
SideBar* BrowserWindow::addSideBar()
{
if (m_sideBar) {
@ -786,9 +795,9 @@ void BrowserWindow::toggleFullScreen()
}
if (isFullScreen())
setWindowState(windowState() & ~Qt::WindowFullScreen);
showNormal();
else
setWindowState(windowState() | Qt::WindowFullScreen);
showFullScreen();
}
void BrowserWindow::enterHtmlFullScreen()
@ -1049,9 +1058,9 @@ bool BrowserWindow::event(QEvent* event)
case QEvent::WindowStateChange: {
QWindowStateChangeEvent* ev = static_cast<QWindowStateChangeEvent*>(event);
if (!(ev->oldState() & Qt::WindowFullScreen) && windowState() & Qt::WindowFullScreen) {
if (!(m_oldWindowState & Qt::WindowFullScreen) && windowState() & Qt::WindowFullScreen) {
// Enter fullscreen
m_windowStates = ev->oldState();
m_normalWindowState = m_oldWindowState;
m_statusBarVisible = statusBar()->isVisible();
#ifndef Q_OS_MACOS
@ -1063,7 +1072,7 @@ bool BrowserWindow::event(QEvent* event)
m_navigationContainer->hide();
m_navigationToolbar->buttonExitFullscreen()->show();
}
else if (ev->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {
else if (m_oldWindowState & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {
// Leave fullscreen
statusBar()->setVisible(m_statusBarVisible);
#ifndef Q_OS_MACOS
@ -1074,13 +1083,13 @@ bool BrowserWindow::event(QEvent* event)
m_navigationToolbar->setSuperMenuVisible(!m_menuBarVisible);
m_navigationToolbar->buttonExitFullscreen()->hide();
m_isHtmlFullScreen = false;
setWindowState(m_windowStates);
}
if (m_hideNavigationTimer) {
m_hideNavigationTimer->stop();
}
m_oldWindowState = windowState();
break;
}

5
src/lib/app/browserwindow.h
View File

@ -141,6 +141,8 @@ public slots:
void loadAddress(const QUrl &url);
void showSource(WebView *view = Q_NULLPTR);
void showNormal();
private slots:
void addTab();
void openLocation();
@ -211,7 +213,8 @@ private:
bool m_menuBarVisible;
bool m_statusBarVisible;
bool m_isHtmlFullScreen;
Qt::WindowStates m_windowStates;
Qt::WindowStates m_oldWindowState = Qt::WindowNoState;
Qt::WindowStates m_normalWindowState = Qt::WindowNoState;
QTimer* m_hideNavigationTimer;
QList<QPointer<QWidget> > m_deleteOnCloseWidgets;