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

ComboTabBar: Fix height when starting with only pinned tabs

Browse Source
This commit is contained in:
David Rosca 2018-02-10 08:54:04 +01:00
parent 582fb72115
commit 3e2e4fa2ce
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,6 +527,10 @@ void ComboTabBar::setUpLayout()
{ {
int height = qMax(m_mainTabBar->height(), m_pinnedTabBar->height()); int height = qMax(m_mainTabBar->height(), m_pinnedTabBar->height());
if (height < 1) {
height = qMax(m_mainTabBar->sizeHint().height(), m_pinnedTabBar->sizeHint().height());
}
// Workaround for Oxygen theme. For some reason, QTabBar::height() returns bigger // Workaround for Oxygen theme. For some reason, QTabBar::height() returns bigger
// height than it actually should. // height than it actually should.
if (mApp->styleName() == QLatin1String("oxygen")) { if (mApp->styleName() == QLatin1String("oxygen")) {
@ -538,7 +542,6 @@ void ComboTabBar::setUpLayout()
height = qMax(5, height); height = qMax(5, height);
setFixedHeight(height); setFixedHeight(height);
m_pinnedTabBar->setFixedHeight(height);
m_leftContainer->setFixedHeight(height); m_leftContainer->setFixedHeight(height);
m_rightContainer->setFixedHeight(height); m_rightContainer->setFixedHeight(height);
m_mainTabBarWidget->setUpLayout(); m_mainTabBarWidget->setUpLayout();
@ -546,10 +549,10 @@ void ComboTabBar::setUpLayout()
setMinimumWidths(); setMinimumWidths();
if (isVisible() && m_mainTabBar->count() > 0) { if (isVisible() && height > 5) {
// ComboTabBar is now visible, we can sync heights of both tabbars // ComboTabBar is now visible, we can sync heights of both tabbars
m_pinnedTabBar->setFixedHeight(m_mainTabBar->sizeHint().height()); m_mainTabBar->setFixedHeight(height);
m_mainTabBar->setFixedHeight(m_mainTabBar->sizeHint().height()); m_pinnedTabBar->setFixedHeight(height);
} }
} }