summaryrefslogtreecommitdiff
path: root/src/interface/Button.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-02-01 18:45:59 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-02-01 18:45:59 (GMT)
commit038da72c61ea6a251d805e2de3662f240da52b02 (patch)
tree05170050b16f9d663ec44ae451211e686ba196ac /src/interface/Button.h
parent857b0cc1fc58f066acd59404d16ee5e566e20f00 (diff)
downloadpowder-038da72c61ea6a251d805e2de3662f240da52b02.zip
powder-038da72c61ea6a251d805e2de3662f240da52b02.tar.gz
Console UI, open in browser button, tab and enter shortcut for Login UI, various
Diffstat (limited to 'src/interface/Button.h')
-rw-r--r--src/interface/Button.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/interface/Button.h b/src/interface/Button.h
index 4537e1f..6f485cb 100644
--- a/src/interface/Button.h
+++ b/src/interface/Button.h
@@ -33,8 +33,6 @@ public:
bool Toggleable;
bool Enabled;
- std::string ButtonText;
-
virtual void OnMouseClick(int x, int y, unsigned int button);
virtual void OnMouseUp(int x, int y, unsigned int button);
//virtual void OnMouseUp(int x, int y, unsigned int button);
@@ -72,6 +70,9 @@ protected:
Colour border, activeBorder;
Colour text, activeText;
+ std::string buttonDisplayText;
+ std::string ButtonText;
+
bool isButtonDown, state, isMouseInside, isTogglable, toggle;
ButtonAction * actionCallback;
ui::Point textPosition;