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-08-15 14:25:26 +02:00
commit 1a183e590b
3 changed files with 5 additions and 4 deletions

View File

@ -1075,7 +1075,6 @@ bool BrowserWindow::event(QEvent* event)
statusBar()->hide();
m_navigationContainer->hide();
m_navigationToolbar->setSuperMenuVisible(false);
m_navigationToolbar->buttonExitFullscreen()->setVisible(true);
}
else if (ev->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {

View File

@ -1,6 +1,6 @@
/* ============================================================
* 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
* it under the terms of the GNU General Public License as published by
@ -133,8 +133,8 @@ NavigationBar::NavigationBar(BrowserWindow* window)
m_layout->addWidget(m_buttonHome);
m_layout->addWidget(m_buttonAddTab);
m_layout->addWidget(m_navigationSplitter);
m_layout->addWidget(m_supMenu);
m_layout->addWidget(m_exitFullscreen);
m_layout->addWidget(m_supMenu);
setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));

View File

@ -436,7 +436,9 @@ void TabBar::currentTabChanged(int index)
showCloseButton(index);
hideCloseButton(m_tabWidget->lastTabIndex());
ensureVisible(index);
QTimer::singleShot(0, this, [=]() {
ensureVisible(index);
});
}
m_tabWidget->currentTabChanged(index);