summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-28 22:55:22 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-28 22:55:22 +0300
commit33d882f071b4445bcb41921c99be7f33217897b1 (patch)
tree425928e40924dbe33ebc66a68a7bb1906f72419d
parent7c8410604d16e960a4ef7727517dd5fd43e9499e (diff)
downloadplus-33d882f071b4445bcb41921c99be7f33217897b1.tar.gz
plus-33d882f071b4445bcb41921c99be7f33217897b1.tar.bz2
plus-33d882f071b4445bcb41921c99be7f33217897b1.tar.xz
plus-33d882f071b4445bcb41921c99be7f33217897b1.zip
move bools in tabbedarea.
-rw-r--r--src/gui/widgets/tabbedarea.cpp4
-rw-r--r--src/gui/widgets/tabbedarea.h11
2 files changed, 5 insertions, 10 deletions
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 3a9ded199..5e3af38d4 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -44,12 +44,12 @@ TabbedArea::TabbedArea(const Widget2 *const widget) :
mWidgetContainer(new gcn::Container()),
mTabsToDelete(),
mTabs(),
- mOpaque(false),
mTabsWidth(0),
mVisibleTabsWidth(0),
mTabScrollIndex(0),
- mEnableScrollButtons(false),
mRightMargin(0),
+ mOpaque(false),
+ mEnableScrollButtons(false),
mFollowDownScroll(false),
mBlockSwitching(true),
mResizeHeight(true)
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 114d549ff..ec0b43b5e 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -201,17 +201,11 @@ class TabbedArea final : public Widget2,
void updateTabsWidth();
Tab* mSelectedTab;
-
gcn::Container* mTabContainer;
-
gcn::Container* mWidgetContainer;
-
std::vector<Tab*> mTabsToDelete;
-
std::vector<std::pair<Tab*, gcn::Widget*> > mTabs;
- bool mOpaque;
-
/**
* The overall width of all tab.
*/
@@ -234,10 +228,11 @@ class TabbedArea final : public Widget2,
* So the first tab displayed may not be the first in the list.
* @note the index must start at 0.
*/
- unsigned mTabScrollIndex;
+ unsigned int mTabScrollIndex;
+ int mRightMargin;
+ bool mOpaque;
bool mEnableScrollButtons;
- int mRightMargin;
bool mFollowDownScroll;
bool mBlockSwitching;
bool mResizeHeight;