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

[Code] TabHelper: Rename m_pinnedTabBar to m_isPinnedTabBar

Browse Source 
[ci skip]
This commit is contained in:
David Rosca 2014-05-02 22:16:48 +02:00
parent 78fbccae15
commit 34feb19dab
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,8 +49,8 @@ ComboTabBar::ComboTabBar(QWidget* parent)
{
QObject::setObjectName(QSL("tabbarwidget"));
m_mainTabBar = new TabBarHelper(/*pinnedTabBar*/ false, this);
m_pinnedTabBar = new TabBarHelper(/*pinnedTabBar*/ true, this);
m_mainTabBar = new TabBarHelper(/*isPinnedTabBar*/ false, this);
m_pinnedTabBar = new TabBarHelper(/*isPinnedTabBar*/ true, this);
m_mainTabBarWidget = new TabBarScrollWidget(m_mainTabBar, this);
m_pinnedTabBarWidget = new TabBarScrollWidget(m_pinnedTabBar, this);
@ -918,7 +918,7 @@ void ComboTabBar::leaveEvent(QEvent* event)
}
TabBarHelper::TabBarHelper(bool pinnedTabBar, ComboTabBar* comboTabBar)
TabBarHelper::TabBarHelper(bool isPinnedTabBar, ComboTabBar* comboTabBar)
: QTabBar(comboTabBar)
, m_comboTabBar(comboTabBar)
, m_scrollArea(0)
@ -926,7 +926,7 @@ TabBarHelper::TabBarHelper(bool pinnedTabBar, ComboTabBar* comboTabBar)
, m_pressedGlobalX(-1)
, m_dragInProgress(false)
, m_activeTabBar(false)
, m_pinnedTabBar(pinnedTabBar)
, m_isPinnedTabBar(isPinnedTabBar)
, m_useFastTabSizeHint(false)
, m_bluredBackground(false)
{
@ -966,7 +966,7 @@ void TabBarHelper::setActiveTabBar(bool activate)
if (!m_activeTabBar) {
m_comboTabBar->m_blockCurrentChangedSignal = true;
setCurrentIndex(m_pinnedTabBar ? count() - 1 : 0);
setCurrentIndex(m_isPinnedTabBar ? count() - 1 : 0);
m_comboTabBar->m_blockCurrentChangedSignal = false;
}
@ -1211,7 +1211,7 @@ void TabBarHelper::initStyleOption(QStyleOptionTab* option, int tabIndex) const
{
QTabBar::initStyleOption(option, tabIndex);
int index = m_pinnedTabBar ? tabIndex : m_comboTabBar->pinnedTabsCount() + tabIndex;
int index = m_isPinnedTabBar ? tabIndex : m_comboTabBar->pinnedTabsCount() + tabIndex;
if (m_comboTabBar->count() > 1) {
if (index == 0)

4
src/lib/tabwidget/combotabbar.h
View File

@ -212,7 +212,7 @@ class QUPZILLA_EXPORT TabBarHelper : public QTabBar
Q_OBJECT
public:
explicit TabBarHelper(bool pinnedTabBar, ComboTabBar* comboTabBar);
explicit TabBarHelper(bool isPinnedTabBar, ComboTabBar* comboTabBar);
void setTabButton(int index, QTabBar::ButtonPosition position, QWidget* widget);
@ -254,7 +254,7 @@ private:
int m_pressedGlobalX;
bool m_dragInProgress;
bool m_activeTabBar;
bool m_pinnedTabBar;
bool m_isPinnedTabBar;
bool m_useFastTabSizeHint;
bool m_bluredBackground;
};