diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-07-28 23:17:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-07-28 23:17:09 +0300 |
| commit | 4672d4cbf51156d3225110aa9bf47703df68fe49 (patch) | |
| tree | 6ba466e3af83c56c832c1b08e37af54e94fe487f /src | |
| parent | e452560778b5b5966986cbdf16983f7defa8f2ab (diff) | |
| download | manaverse-4672d4cbf51156d3225110aa9bf47703df68fe49.tar.gz manaverse-4672d4cbf51156d3225110aa9bf47703df68fe49.tar.bz2 manaverse-4672d4cbf51156d3225110aa9bf47703df68fe49.tar.xz manaverse-4672d4cbf51156d3225110aa9bf47703df68fe49.zip | |
move bools in textfield.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/textfield.cpp | 10 | ||||
| -rw-r--r-- | src/gui/widgets/textfield.h | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index b4aace3cf..bc2d9c946 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -56,15 +56,15 @@ TextField::TextField(const Widget2 *const widget, gcn::FocusListener(), Widget2(widget), mSendAlwaysEvents(sendAlwaysEvents), - mNumeric(false), + mCaretColor(&getThemeColor(Theme::CARET)), + mForegroundColor2(getThemeColor(Theme::TEXTFIELD_OUTLINE)), + mPopupMenu(nullptr), mMinimum(0), mMaximum(0), - mLoseFocusOnTab(loseFocusOnTab), mLastEventPaste(false), mPadding(1), - mCaretColor(&getThemeColor(Theme::CARET)), - mForegroundColor2(getThemeColor(Theme::TEXTFIELD_OUTLINE)), - mPopupMenu(nullptr) + mNumeric(false), + mLoseFocusOnTab(loseFocusOnTab) { setFrameSize(2); mForegroundColor = getThemeColor(Theme::TEXTFIELD); diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 5e1553acd..8990730ba 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -140,18 +140,18 @@ class TextField : public gcn::TextField, static Skin *mSkin; private: + const gcn::Color *mCaretColor; + gcn::Color mForegroundColor2; + PopupMenu *mPopupMenu; static int instances; static float mAlpha; static ImageRect skin; - bool mNumeric; int mMinimum; - unsigned mMaximum; - bool mLoseFocusOnTab; + unsigned int mMaximum; int mLastEventPaste; int mPadding; - const gcn::Color *mCaretColor; - gcn::Color mForegroundColor2; - PopupMenu *mPopupMenu; + bool mNumeric; + bool mLoseFocusOnTab; }; #endif // GUI_WIDGETS_TEXTFIELD_H |