1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Merge branch 'v2.0'

This commit is contained in:
David Rosca 2016-07-10 17:26:42 +02:00
commit 7ac832c689
2 changed files with 5 additions and 5 deletions

View File

@ -788,9 +788,9 @@ void BrowserWindow::toggleFullScreen()
} }
if (isFullScreen()) if (isFullScreen())
showNormal(); setWindowState(windowState() & ~Qt::WindowFullScreen);
else else
showFullScreen(); setWindowState(windowState() | Qt::WindowFullScreen);
} }
void BrowserWindow::enterHtmlFullScreen() void BrowserWindow::enterHtmlFullScreen()

View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - WebKit based browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2016 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
@ -139,8 +139,8 @@ void TabBar::closeAllButCurrent()
QSize TabBar::tabSizeHint(int index, bool fast) const QSize TabBar::tabSizeHint(int index, bool fast) const
{ {
if (!isVisible()) { if (!m_window->isVisible()) {
// Don't calculate it when tabbar is not visible // Don't calculate it when window is not visible
// It produces invalid size anyway // It produces invalid size anyway
return QSize(-1, -1); return QSize(-1, -1);
} }