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

Merge branch 'v2.0'

Browse Source
This commit is contained in:
David Rosca 2016-08-15 14:51:19 +02:00
commit 5085111657
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/tabwidget/combotabbar.cpp
View File

@ -578,6 +578,8 @@ int ComboTabBar::pinTabBarWidth() const
bool ComboTabBar::event(QEvent *event)
{
const bool res = QWidget::event(event);
switch (event->type()) {
case QEvent::ToolTip:
if (!isDragInProgress() && !isScrollInProgress()) {
@ -606,7 +608,7 @@ bool ComboTabBar::event(QEvent *event)
break;
}
return QWidget::event(event);
return res;
}
void ComboTabBar::wheelEvent(QWheelEvent* event)
@ -1394,7 +1396,6 @@ void TabBarScrollWidget::ensureVisible(int index, int xmargin)
if (index < 0 || index >= m_tabBar->count()) {
return;
}
xmargin = qMin(xmargin, m_scrollArea->viewport()->width() / 2);
// Qt Bug? the following lines were taken from QScrollArea::ensureVisible() and

2
src/lib/tabwidget/tabbar.cpp
View File

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