Merge remote-tracking branch 'origin/master'

2 files changed, 35 insertions, 13 deletions

diff --git a/src/interface/Button.cpp b/src/interface/Button.cpp
index fbf9b54..4b9c5d9 100644
--- a/src/interface/Button.cpp
+++ b/src/interface/Button.cpp
@@ -156,26 +156,38 @@ void Button::Draw(const Point& screenPos)
 
 void Button::OnMouseUnclick(int x, int y, unsigned int button)
 {
-    if(button != 1)
+    if(button == 1)
     {
-        return;
+        if(isButtonDown)
+		{
+		    isButtonDown = false;
+			DoAction();
+		}
     }
-
-    if(isButtonDown)
+    else if(button == 3)
     {
-	    isButtonDown = false;
-		DoAction();
-    }
+	    if(isAltButtonDown)
+	    {
+	    	isAltButtonDown = false;
+	    	DoAltAction();
+	    }
+	}
 }
 
 void Button::OnMouseClick(int x, int y, unsigned int button)
 {
-    if(button != 1) return;
-	if(isTogglable)
-	{
-		toggle = !toggle;
+    if(button == 1)
+    {
+		if(isTogglable)
+		{
+			toggle = !toggle;
+		}
+		isButtonDown = true;
+	}
+	else if(button == 3)
+    {
+		isAltButtonDown = true;
 	}
-    isButtonDown = true;
 }
 
 void Button::OnMouseEnter(int x, int y)
@@ -206,6 +218,14 @@ void Button::DoAction()
 		actionCallback->ActionCallback(this);
 }
 
+void Button::DoAltAction()
+{
+	if(!Enabled)
+		return;
+	if(actionCallback)
+		actionCallback->AltActionCallback(this);
+}
+
 void Button::SetActionCallback(ButtonAction * action)
 {
 	if(actionCallback)
diff --git a/src/interface/Button.h b/src/interface/Button.h
index 5bc7fc3..dff15b4 100644
--- a/src/interface/Button.h
+++ b/src/interface/Button.h
@@ -20,6 +20,7 @@ class ButtonAction
 {
 public:
 	virtual void ActionCallback(ui::Button * sender) {}
+	virtual void AltActionCallback(ui::Button * sender) {}
 	virtual void MouseEnterCallback(ui::Button * sender) {}
 	virtual ~ButtonAction() {}
 };
@@ -45,6 +46,7 @@ public:
 	virtual void TextPosition();
 	inline bool GetState() { return state; }
 	virtual void DoAction(); //action of button what ever it may be
+	virtual void DoAltAction(); //action of button what ever it may be
 	void SetTogglable(bool isTogglable);
 	bool GetTogglable();
 	TPT_NO_INLINE bool GetToggleState();
@@ -60,7 +62,7 @@ protected:
 	std::string buttonDisplayText;
 	std::string ButtonText;
 
-	bool isButtonDown, state, isMouseInside, isTogglable, toggle;
+	bool isButtonDown, isAltButtonDown, state, isMouseInside, isTogglable, toggle;
 	ButtonAction * actionCallback;
 
 };