From e12a9ff4e75bad8da4215b92683a986547701207 Mon Sep 17 00:00:00 2001
From: DinkyDyeAussie <travis.m.greer_32@hotmail.com>
Date: Mon, 19 Sep 2016 20:04:44 +1000
Subject: [PATCH] Updated ButtonStyle Code
Slowly improving the style code so as to make the buttons behave more like the original Warcraft 2 or like in Wyrmsun.
---
src/include/ui.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/include/ui.h b/src/include/ui.h
index 434b8b9f9..e21184b2d 100644
--- a/src/include/ui.h
+++ b/src/include/ui.h
@@ -124,7 +124,9 @@ public:
class CUIButton
{
public:
- CUIButton() : X(0), Y(0), Style(NULL), Callback(NULL) {}
+ // CUIButton() : X(0), Y(0), Style(NULL), Callback(NULL) {} //OLD BUTTON STYLE CODE
+ // NEW CODE BELOW, THANKS TO ANDRETTIN - MODIFIED BY DINKY
+ CUIButton() : X(0), Y(0), Clicked(false), HotKeyPressed(false), Style(NULL), Callback(NULL) {}
~CUIButton() {}
bool Contains(const PixelPos &screenPos) const;
@@ -132,6 +134,10 @@ public:
public:
int X; /// x coordinate on the screen
int Y; /// y coordinate on the screen
+ //NEW CODE START
+ bool Clicked; /// whether the button is currently clicked or not
+ bool HotKeyPressed; /// whether the buttons hotkey is currently pressed or not
+ // NEW CODE END
std::string Text; /// button text
ButtonStyle *Style; /// button style
LuaActionListener *Callback; /// callback function