summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/widgets/button.cpp57
-rw-r--r--src/gui/widgets/button.h12
2 files changed, 35 insertions, 34 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 42fb754e6..ae6886e72 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -63,13 +63,8 @@ Button::Button(const Widget2 *const widget) :
gcn::Button(),
Widget2(widget),
gcn::WidgetListener(),
- mDescription(""), mClickCount(0),
- mTag(0),
+ mDescription(),
mVertexes2(new ImageCollection),
- mRedraw(true),
- mMode(0),
- mXOffset(0),
- mYOffset(0),
mEnabledColor(getThemeColor(Theme::BUTTON)),
mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)),
mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
@@ -80,8 +75,14 @@ Button::Button(const Widget2 *const widget) :
mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)),
mImages(nullptr),
mImageSet(nullptr),
+ mClickCount(0),
+ mTag(0),
+ mMode(0),
+ mXOffset(0),
+ mYOffset(0),
mImageWidth(0),
mImageHeight(0),
+ mRedraw(true),
mStick(false),
mPressed(false)
{
@@ -95,14 +96,8 @@ Button::Button(const Widget2 *const widget,
gcn::Button(caption),
Widget2(widget),
gcn::WidgetListener(),
- mDescription(""),
- mClickCount(0),
- mTag(0),
+ mDescription(),
mVertexes2(new ImageCollection),
- mRedraw(true),
- mMode(0),
- mXOffset(0),
- mYOffset(0),
mEnabledColor(getThemeColor(Theme::BUTTON)),
mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)),
mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
@@ -113,8 +108,14 @@ Button::Button(const Widget2 *const widget,
mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)),
mImages(nullptr),
mImageSet(nullptr),
+ mClickCount(0),
+ mTag(0),
+ mMode(0),
+ mXOffset(0),
+ mYOffset(0),
mImageWidth(0),
mImageHeight(0),
+ mRedraw(true),
mStick(false),
mPressed(false)
{
@@ -134,14 +135,8 @@ Button::Button(const Widget2 *const widget,
gcn::Button(caption),
Widget2(widget),
gcn::WidgetListener(),
- mDescription(""),
- mClickCount(0),
- mTag(0),
+ mDescription(),
mVertexes2(new ImageCollection),
- mRedraw(true),
- mMode(0),
- mXOffset(0),
- mYOffset(0),
mEnabledColor(getThemeColor(Theme::BUTTON)),
mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)),
mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
@@ -152,8 +147,14 @@ Button::Button(const Widget2 *const widget,
mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)),
mImages(nullptr),
mImageSet(nullptr),
+ mClickCount(0),
+ mTag(0),
+ mMode(0),
+ mXOffset(0),
+ mYOffset(0),
mImageWidth(imageWidth),
mImageHeight(imageHeight),
+ mRedraw(true),
mStick(false),
mPressed(false)
{
@@ -170,17 +171,11 @@ Button::Button(const Widget2 *const widget, const std::string &imageName,
const int imageWidth, const int imageHeight,
const std::string &actionEventId,
gcn::ActionListener *const listener) :
- gcn::Button(""),
+ gcn::Button(),
Widget2(widget),
gcn::WidgetListener(),
- mDescription(""),
- mClickCount(0),
- mTag(0),
+ mDescription(),
mVertexes2(new ImageCollection),
- mRedraw(true),
- mMode(0),
- mXOffset(0),
- mYOffset(0),
mEnabledColor(getThemeColor(Theme::BUTTON)),
mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)),
mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
@@ -191,8 +186,14 @@ Button::Button(const Widget2 *const widget, const std::string &imageName,
mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)),
mImages(nullptr),
mImageSet(nullptr),
+ mClickCount(0),
+ mTag(0),
+ mMode(0),
+ mXOffset(0),
+ mYOffset(0),
mImageWidth(imageWidth),
mImageHeight(imageHeight),
+ mRedraw(true),
mStick(false),
mPressed(false)
{
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 3509aeded..4d581f80d 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -145,13 +145,7 @@ class Button final : public gcn::Button,
static float mAlpha;
std::string mDescription;
- unsigned mClickCount;
- int mTag;
ImageCollection *mVertexes2;
- bool mRedraw;
- int mMode;
- int mXOffset;
- int mYOffset;
gcn::Color mEnabledColor;
gcn::Color mEnabledColor2;
gcn::Color mDisabledColor;
@@ -162,8 +156,14 @@ class Button final : public gcn::Button,
gcn::Color mPressedColor2;
Image **mImages;
ImageSet *mImageSet;
+ unsigned mClickCount;
+ int mTag;
+ int mMode;
+ int mXOffset;
+ int mYOffset;
int mImageWidth;
int mImageHeight;
+ bool mRedraw;
bool mStick;
bool mPressed;
};