summaryrefslogtreecommitdiff
path: root/src/gui/widgets/button.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-10 15:37:27 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-10 15:37:27 +0300
commitb2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed (patch)
treefe270dd4eec62bd6973d5e21d6662f78cc93b24c /src/gui/widgets/button.h
parent66b6d8d740670a6053d0714ed63776119f7e13c3 (diff)
downloadmv-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.tar.gz
mv-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.tar.bz2
mv-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.tar.xz
mv-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.zip
Sort varibles in button and remove some unused functions.
Diffstat (limited to 'src/gui/widgets/button.h')
-rw-r--r--src/gui/widgets/button.h71
1 files changed, 27 insertions, 44 deletions
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 7491ef987..9c9dce3cc 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -233,25 +233,6 @@ class Button final : public Widget,
Graphics::Alignment getAlignment() const
{ return mAlignment; }
- /**
- * Sets the spacing between the border of the button and its caption.
- *
- * @param spacing The default value for spacing is 4 and can be changed
- * using this method.
- * @see getSpacing
- */
- void setSpacing(unsigned int spacing)
- { mSpacing = spacing; }
-
- /**
- * Gets the spacing between the border of the button and its caption.
- *
- * @return spacing.
- * @see setSpacing
- */
- unsigned int getSpacing() const
- { return mSpacing; }
-
void focusLost(const Event& event) override final;
void mousePressed(MouseEvent& event) override final;
@@ -291,31 +272,6 @@ class Button final : public Widget,
*/
std::string mCaption;
- /**
- * True if the mouse is ontop of the button, false otherwise.
- */
- bool mHasMouse;
-
- /**
- * True if a key has been pressed, false otherwise.
- */
- bool mKeyPressed;
-
- /**
- * True if a mouse has been pressed, false otherwise.
- */
- bool mMousePressed;
-
- /**
- * Holds the alignment of the caption.
- */
- Graphics::Alignment mAlignment;
-
- /**
- * Holds the spacing between the border and the caption.
- */
- unsigned int mSpacing;
-
std::string mDescription;
ImageCollection *mVertexes2;
Color mEnabledColor;
@@ -328,13 +284,40 @@ class Button final : public Widget,
Color mPressedColor2;
Image **mImages;
ImageSet *mImageSet;
+
+ /**
+ * Holds the alignment of the caption.
+ */
+ Graphics::Alignment mAlignment;
+
unsigned mClickCount;
+
+ /**
+ * Holds the spacing between the border and the caption.
+ */
+ unsigned int mSpacing;
+
int mTag;
int mMode;
int mXOffset;
int mYOffset;
int mImageWidth;
int mImageHeight;
+ /**
+ * True if the mouse is ontop of the button, false otherwise.
+ */
+ bool mHasMouse;
+
+ /**
+ * True if a key has been pressed, false otherwise.
+ */
+ bool mKeyPressed;
+
+ /**
+ * True if a mouse has been pressed, false otherwise.
+ */
+ bool mMousePressed;
+
bool mStick;
bool mPressed;
};