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

[ComboTabBar] Setup layout as soon as possible.

Browse Source 
Also fixed typo widthes -> widths
This commit is contained in:
nowrep 2013-12-24 12:28:51 +01:00
parent 91a8930a0d
commit 23d402a12b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/tools/combotabbar.cpp
View File

@ -53,9 +53,9 @@ ComboTabBar::ComboTabBar(QWidget* parent)
m_mainTabBar->setScrollArea(m_mainTabBarWidget->scrollArea());
m_pinnedTabBar->setScrollArea(m_pinnedTabBarWidget->scrollArea());
connect(m_mainTabBarWidget->scrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(setMinimumWidthes()));
connect(m_mainTabBarWidget->scrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(setMinimumWidths()));
connect(m_mainTabBarWidget->scrollBar(), SIGNAL(valueChanged(int)), this, SIGNAL(scrollBarValueChanged(int)));
connect(m_pinnedTabBarWidget->scrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(setMinimumWidthes()));
connect(m_pinnedTabBarWidget->scrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(setMinimumWidths()));
connect(m_pinnedTabBarWidget->scrollBar(), SIGNAL(valueChanged(int)), this, SIGNAL(scrollBarValueChanged(int)));
connect(this, SIGNAL(overFlowChanged(bool)), m_mainTabBarWidget, SLOT(overFlowChanged(bool)));
@ -125,7 +125,7 @@ int ComboTabBar::insertTab(int index, const QIcon &icon, const QString &text, bo
updatePinnedTabBarVisibility();
tabInserted(index);
setMinimumWidthes();
setMinimumWidths();
return index;
}
@ -137,7 +137,7 @@ void ComboTabBar::removeTab(int index)
updatePinnedTabBarVisibility();
tabRemoved(index);
setMinimumWidthes();
setMinimumWidths();
}
}
@ -450,7 +450,7 @@ bool ComboTabBar::isPinned(int index) const
void ComboTabBar::setMaxVisiblePinnedTab(int max)
{
m_maxVisiblePinnedTab = max;
setMinimumWidthes();
setMinimumWidths();
}
void ComboTabBar::setObjectName(const QString &name)
@ -485,16 +485,16 @@ void ComboTabBar::setUpLayout()
height -= 4;
}
if (height <= 0) {
return;
}
// We need to setup heights even before m_mainTabBar->height() has correct value
// So lets just set minimum 5px height
height = qMax(5, height);
setFixedHeight(height);
m_pinnedTabBar->setFixedHeight(height);
m_mainTabBarWidget->setUpLayout();
m_pinnedTabBarWidget->setUpLayout();
setMinimumWidthes();
setMinimumWidths();
}
void ComboTabBar::insertCloseButton(int index)
@ -563,7 +563,7 @@ void ComboTabBar::resizeEvent(QResizeEvent* event)
QWidget::resizeEvent(event);
if (m_mainBarOverFlowed != m_mainTabBarWidget->scrollBar()->isOverFlowed()) {
setMinimumWidthes();
setMinimumWidths();
}
}
@ -724,7 +724,7 @@ void ComboTabBar::updatePinnedTabBarVisibility()
}
}
void ComboTabBar::setMinimumWidthes()
void ComboTabBar::setMinimumWidths()
{
if (!isVisible() || comboTabBarPixelMetric(PinnedTabWidth) < 0) {
return;

2
src/lib/tools/combotabbar.h
View File

@ -136,7 +136,7 @@ public slots:
void setCurrentIndex(int index);
private slots:
void setMinimumWidthes();
void setMinimumWidths();
void slotCurrentChanged(int index);
void slotTabCloseRequested(int index);
void slotTabMoved(int from, int to);