Fix slight issues when clicking on menu section buttons and missing isMouseInside in MouseEnter action for buttons

2 files changed, 6 insertions, 0 deletions

diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index ed8e6fe..9d97a33 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -242,6 +242,10 @@ public:
 	{
 		v->c->SetActiveMenu(menu);
 	}
+	void ActionCallback(ui::Button * sender)
+	{
+		MouseEnterCallback(sender);
+	}
 };
 
 class GameView::ToolAction: public ui::ButtonAction
diff --git a/src/interface/Button.cpp b/src/interface/Button.cpp
index a7aa387..9a59c01 100644
--- a/src/interface/Button.cpp
+++ b/src/interface/Button.cpp
@@ -136,12 +136,14 @@ void Button::OnMouseClick(int x, int y, unsigned int button)
 
 void Button::OnMouseEnter(int x, int y)
 {
+    isMouseInside = true;
 	if(!Enabled)
 		return;
 	if(actionCallback)
 		actionCallback->MouseEnterCallback(this);
 }
 
+
 void Button::OnMouseLeave(int x, int y)
 {
     isMouseInside = false;