Merge pull request #3 from JosiahWI/ui_revamp

[dragonfireclient.git] / src / gui / guiButton.h

diff --git a/src/gui/guiButton.h b/src/gui/guiButton.h
index 37b278d25aca18830264a91e701819dacdd7cefd..95fa1a2a1bd268e40417db432e83f48d081c0844 100644 (file)
--- a/src/gui/guiButton.h
+++ b/src/gui/guiButton.h
@@ -13,6 +13,7 @@
 #include "ITexture.h"\r
 #include "SColor.h"\r
 #include "guiSkin.h"\r
+#include "StyleSpec.h"\r
 \r
 using namespace irr;\r
 \r
@@ -67,7 +68,6 @@ using namespace irr;
 #endif\r
 \r
 class ISimpleTextureSource;\r
-class StyleSpec;\r
 \r
 class GUIButton : public gui::IGUIButton\r
 {\r
@@ -75,7 +75,8 @@ class GUIButton : public gui::IGUIButton
 \r
        //! constructor\r
        GUIButton(gui::IGUIEnvironment* environment, gui::IGUIElement* parent,\r
-                          s32 id, core::rect<s32> rectangle, bool noclip=false);\r
+                          s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,\r
+                          bool noclip=false);\r
 \r
        //! destructor\r
        virtual ~GUIButton();\r
@@ -125,16 +126,10 @@ class GUIButton : public gui::IGUIButton
        //! Sets an image which should be displayed on the button when it is in pressed state.\r
        virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& pos) override;\r
 \r
-       //! Sets an image which should be displayed on the button when it is in hovered state.\r
-       virtual void setHoveredImage(video::ITexture* image=nullptr);\r
-\r
        //! Sets the text displayed by the button\r
        virtual void setText(const wchar_t* text) override;\r
        // END PATCH\r
 \r
-       //! Sets an image which should be displayed on the button when it is in hovered state.\r
-       virtual void setHoveredImage(video::ITexture* image, const core::rect<s32>& pos);\r
-\r
        //! Sets the sprite bank used by the button\r
        virtual void setSpriteBank(gui::IGUISpriteBank* bank=0) override;\r
 \r
@@ -225,22 +220,29 @@ class GUIButton : public gui::IGUIButton
 \r
        void setColor(video::SColor color);\r
        // PATCH\r
-       void setHoveredColor(video::SColor color);\r
-       void setPressedColor(video::SColor color);\r
+       //! Set element properties from a StyleSpec corresponding to the button state\r
+       void setFromState();\r
 \r
        //! Set element properties from a StyleSpec\r
-       virtual void setFromStyle(const StyleSpec& style, ISimpleTextureSource *tsrc);\r
+       virtual void setFromStyle(const StyleSpec& style);\r
+\r
+       //! Set the styles used for each state\r
+       void setStyles(const std::array<StyleSpec, StyleSpec::NUM_STATES>& styles);\r
        // END PATCH\r
 \r
 \r
        //! Do not drop returned handle\r
-       static GUIButton* addButton(gui::IGUIEnvironment *environment, const core::rect<s32>& rectangle,\r
-                                                                       IGUIElement* parent, s32 id, const wchar_t* text, const wchar_t *tooltiptext=L"");\r
+       static GUIButton* addButton(gui::IGUIEnvironment *environment,\r
+                       const core::rect<s32>& rectangle, ISimpleTextureSource *tsrc,\r
+                       IGUIElement* parent, s32 id, const wchar_t* text,\r
+                       const wchar_t *tooltiptext=L"");\r
 \r
 protected:\r
        void drawSprite(gui::EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center);\r
        gui::EGUI_BUTTON_IMAGE_STATE getImageState(bool pressed) const;\r
 \r
+       ISimpleTextureSource *getTextureSource() { return TSrc; }\r
+\r
        struct ButtonImage\r
        {\r
                ButtonImage() : Texture(0), SourceRect(core::rect<s32>(0,0,0,0))\r
@@ -308,6 +310,8 @@ class GUIButton : public gui::IGUIButton
 \r
        ButtonImage ButtonImages[gui::EGBIS_COUNT];\r
 \r
+       std::array<StyleSpec, StyleSpec::NUM_STATES> Styles;\r
+\r
        gui::IGUIFont* OverrideFont;\r
 \r
        bool OverrideColorEnabled;\r
@@ -326,9 +330,13 @@ class GUIButton : public gui::IGUIButton
 \r
        video::SColor Colors[4];\r
        // PATCH\r
-       video::SColor HoveredColors[4];\r
-       video::SColor PressedColors[4];\r
+       bool WasHovered = false;\r
+       ISimpleTextureSource *TSrc;\r
 \r
        gui::IGUIStaticText *StaticText;\r
+\r
+       core::rect<s32> BgMiddle;\r
+       core::rect<s32> Padding;\r
+       core::vector2d<s32> ContentOffset;\r
        // END PATCH\r
 };\r