From 1ad14b232fd93d4f96493169830969f42b2fe498 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Fri, 22 Sep 2017 16:57:01 +0200
Subject: [PATCH] Adjust ImageButton to accept key focus and use the
 'highlighted' texture

---
 components/widgets/imagebutton.cpp | 54 +++++++++++++++++++++++++-----
 components/widgets/imagebutton.hpp | 11 ++++++
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/components/widgets/imagebutton.cpp b/components/widgets/imagebutton.cpp
index 8e3f8ed69..ab0739c2c 100644
--- a/components/widgets/imagebutton.cpp
+++ b/components/widgets/imagebutton.cpp
@@ -5,6 +5,15 @@
 namespace Gui
 {
 
+    ImageButton::ImageButton()
+        : Base()
+        , mMouseFocus(false)
+        , mMousePress(false)
+        , mKeyFocus(false)
+    {
+        setNeedKeyFocus(true);
+    }
+
     void ImageButton::setPropertyOverride(const std::string &_key, const std::string &_value)
     {
         if (_key == "ImageHighlighted")
@@ -24,22 +33,36 @@ namespace Gui
     }
     void ImageButton::onMouseSetFocus(Widget* _old)
     {
-        setImageTexture(mImageHighlighted);
-        ImageBox::onMouseSetFocus(_old);
+        mMouseFocus = true;
+        updateImage();
+        Base::onMouseSetFocus(_old);
     }
 
     void ImageButton::onMouseLostFocus(Widget* _new)
     {
-        setImageTexture(mImageNormal);
-        ImageBox::onMouseLostFocus(_new);
+        mMouseFocus = false;
+        updateImage();
+        Base::onMouseLostFocus(_new);
     }
 
     void ImageButton::onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id)
     {
         if (_id == MyGUI::MouseButton::Left)
-            setImageTexture(mImagePushed);
+        {
+            mMousePress = true;
+            updateImage();
+        }
+        Base::onMouseButtonPressed(_left, _top, _id);
+    }
 
-        ImageBox::onMouseButtonPressed(_left, _top, _id);
+    void ImageButton::updateImage()
+    {
+        if (mMousePress)
+            setImageTexture(mImagePushed);
+        else if (mMouseFocus || mKeyFocus)
+            setImageTexture(mImageHighlighted);
+        else
+            setImageTexture(mImageNormal);
     }
 
     MyGUI::IntSize ImageButton::getRequestedSize()
@@ -70,8 +93,23 @@ namespace Gui
     void ImageButton::onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id)
     {
         if (_id == MyGUI::MouseButton::Left)
-            setImageTexture(mImageHighlighted);
+        {
+            mMousePress = false;
+            updateImage();
+        }
+
+        Base::onMouseButtonReleased(_left, _top, _id);
+    }
 
-        ImageBox::onMouseButtonReleased(_left, _top, _id);
+    void ImageButton::onKeySetFocus(MyGUI::Widget *_old)
+    {
+        mKeyFocus = true;
+        updateImage();
+    }
+
+    void ImageButton::onKeyLostFocus(MyGUI::Widget *_new)
+    {
+        mKeyFocus = false;
+        updateImage();
     }
 }
diff --git a/components/widgets/imagebutton.hpp b/components/widgets/imagebutton.hpp
index a539f15c9..509b1c8c2 100644
--- a/components/widgets/imagebutton.hpp
+++ b/components/widgets/imagebutton.hpp
@@ -16,19 +16,30 @@ namespace Gui
     public:
         MyGUI::IntSize getRequestedSize();
 
+        ImageButton();
+
         /// Set mImageNormal, mImageHighlighted and mImagePushed based on file convention (image_idle.ext, image_over.ext and image_pressed.ext)
         void setImage(const std::string& image);
 
+    private:
+        void updateImage();
+
     protected:
         virtual void setPropertyOverride(const std::string& _key, const std::string& _value);
         virtual void onMouseLostFocus(MyGUI::Widget* _new);
         virtual void onMouseSetFocus(MyGUI::Widget* _old);
         virtual void onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id);
         virtual void onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id);
+        virtual void onKeySetFocus(MyGUI::Widget* _old);
+        virtual void onKeyLostFocus(MyGUI::Widget* _new);
 
         std::string mImageHighlighted;
         std::string mImageNormal;
         std::string mImagePushed;
+
+        bool mMouseFocus;
+        bool mMousePress;
+        bool mKeyFocus;
     };
 
 }