diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-07-29 00:44:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-07-29 00:44:44 +0300 |
commit | b1555ac1dae6f0e0aaa88ca7dd1431de87a8e811 (patch) | |
tree | ddb607bc7acd7e5b1d415b1aa50eb49310193ee1 /src | |
parent | 8e7abb562861d53f9aa0a4fb0ebae52adaeb17e5 (diff) | |
download | manaverse-b1555ac1dae6f0e0aaa88ca7dd1431de87a8e811.tar.gz manaverse-b1555ac1dae6f0e0aaa88ca7dd1431de87a8e811.tar.bz2 manaverse-b1555ac1dae6f0e0aaa88ca7dd1431de87a8e811.tar.xz manaverse-b1555ac1dae6f0e0aaa88ca7dd1431de87a8e811.zip |
move bools in guitable.
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/widgets/guitable.cpp | 12 | ||||
-rw-r--r-- | src/gui/widgets/guitable.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 460fd4218..e3dda4162 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -97,16 +97,16 @@ GuiTable::GuiTable(const Widget2 *const widget, Widget2(widget), gcn::MouseListener(), gcn::KeyListener(), - mLinewiseMode(false), - mWrappingEnabled(false), - mOpaque(opacity), mModel(nullptr), - mSelectedRow(0), - mSelectedColumn(0), mTopWidget(nullptr), mActionListeners(), mBackgroundColor(getThemeColor(Theme::BACKGROUND)), - mHighlightColor(getThemeColor(Theme::HIGHLIGHT)) + mHighlightColor(getThemeColor(Theme::HIGHLIGHT)), + mSelectedRow(0), + mSelectedColumn(0), + mLinewiseMode(false), + mWrappingEnabled(false), + mOpaque(opacity) { setModel(initial_model); setFocusable(true); diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 2296df87b..0bd880c45 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -169,17 +169,11 @@ private: int getRowForY(int y) const A_WARN_UNUSED; // -1 on error int getColumnForX(int x) const A_WARN_UNUSED; // -1 on error void recomputeDimensions(); - bool mLinewiseMode; - bool mWrappingEnabled; - bool mOpaque; static float mAlpha; TableModel *mModel; - int mSelectedRow; - int mSelectedColumn; - /** If someone moves a fresh widget to the top, we must display it. */ gcn::Widget *mTopWidget; @@ -190,8 +184,14 @@ private: * Holds the background color of the table. */ gcn::Color mBackgroundColor; - gcn::Color mHighlightColor; + + int mSelectedRow; + int mSelectedColumn; + + bool mLinewiseMode; + bool mWrappingEnabled; + bool mOpaque; }; #endif // GUI_WIDGETS_GUITABLE_H |