Fix hash implementation for SerializedBlockCache

[dragonfireclient.git] / src / gui / guiButtonImage.cpp

diff --git a/src/gui/guiButtonImage.cpp b/src/gui/guiButtonImage.cpp
index 8796b845d13cdf1a02e95a2ce7537b2e8c4721e3..b507ffecee0dacaaad250882309f8f71b69f0b33 100644 (file)
--- a/src/gui/guiButtonImage.cpp
+++ b/src/gui/guiButtonImage.cpp
@@ -30,8 +30,9 @@ using namespace irr;
 using namespace gui;
 
 GUIButtonImage::GUIButtonImage(gui::IGUIEnvironment *environment,
-               gui::IGUIElement *parent, s32 id, core::rect<s32> rectangle, bool noclip)
-       : GUIButton (environment, parent, id, rectangle, noclip)
+               gui::IGUIElement *parent, s32 id, core::rect<s32> rectangle,
+               ISimpleTextureSource *tsrc, bool noclip)
+       : GUIButton (environment, parent, id, rectangle, tsrc, noclip)
 {
        m_image = Environment->addImage(
                        core::rect<s32>(0,0,rectangle.getWidth(),rectangle.getHeight()), this);
@@ -39,89 +40,37 @@ GUIButtonImage::GUIButtonImage(gui::IGUIEnvironment *environment,
        sendToBack(m_image);
 }
 
-bool GUIButtonImage::OnEvent(const SEvent& event)
-{
-       bool result = GUIButton::OnEvent(event);
-
-       EGUI_BUTTON_IMAGE_STATE imageState = getImageState(isPressed(), m_foreground_images);
-       video::ITexture *texture = m_foreground_images[(u32)imageState].Texture;
-       if (texture != nullptr)
-               m_image->setImage(texture);
-
-       return result;
-}
-
-void GUIButtonImage::setForegroundImage(EGUI_BUTTON_IMAGE_STATE state,
-               video::ITexture *image, const core::rect<s32> &sourceRect)
+void GUIButtonImage::setForegroundImage(video::ITexture *image)
 {
-       if (state >= EGBIS_COUNT)
+       if (image == m_foreground_image)
                return;
 
-       if (image)
+       if (image != nullptr)
                image->grab();
 
-       u32 stateIdx = (u32)state;
-       if (m_foreground_images[stateIdx].Texture)
-               m_foreground_images[stateIdx].Texture->drop();
-
-       m_foreground_images[stateIdx].Texture = image;
-       m_foreground_images[stateIdx].SourceRect = sourceRect;
+       if (m_foreground_image != nullptr)
+               m_foreground_image->drop();
 
-       EGUI_BUTTON_IMAGE_STATE imageState = getImageState(isPressed(), m_foreground_images);
-       if (imageState == stateIdx)
-               m_image->setImage(image);
+       m_foreground_image = image;
+       m_image->setImage(image);
 }
 
-void GUIButtonImage::setForegroundImage(video::ITexture *image)
+//! Set element properties from a StyleSpec
+void GUIButtonImage::setFromStyle(const StyleSpec& style)
 {
-       setForegroundImage(gui::EGBIS_IMAGE_UP, image);
-}
-
-void GUIButtonImage::setForegroundImage(video::ITexture *image, const core::rect<s32> &pos)
-{
-       setForegroundImage(gui::EGBIS_IMAGE_UP, image, pos);
-}
-
-void GUIButtonImage::setPressedForegroundImage(video::ITexture *image)
-{
-       setForegroundImage(gui::EGBIS_IMAGE_DOWN, image);
-}
-
-void GUIButtonImage::setPressedForegroundImage(video::ITexture *image, const core::rect<s32> &pos)
-{
-       setForegroundImage(gui::EGBIS_IMAGE_DOWN, image, pos);
-}
-
-void GUIButtonImage::setHoveredForegroundImage(video::ITexture *image)
-{
-       setForegroundImage(gui::EGBIS_IMAGE_UP_MOUSEOVER, image);
-       setForegroundImage(gui::EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER, image);
-}
-
-void GUIButtonImage::setHoveredForegroundImage(video::ITexture *image, const core::rect<s32> &pos)
-{
-       setForegroundImage(gui::EGBIS_IMAGE_UP_MOUSEOVER, image, pos);
-       setForegroundImage(gui::EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER, image, pos);
-}
-
-void GUIButtonImage::setFromStyle(const StyleSpec &style, ISimpleTextureSource *tsrc)
-{
-       GUIButton::setFromStyle(style, tsrc);
+       GUIButton::setFromStyle(style);
 
        video::IVideoDriver *driver = Environment->getVideoDriver();
 
        if (style.isNotDefault(StyleSpec::FGIMG)) {
-               video::ITexture *texture = style.getTexture(StyleSpec::FGIMG, tsrc);
-               video::ITexture *hovered_texture = style.getTexture(StyleSpec::FGIMG_HOVERED, tsrc, texture);
-               video::ITexture *pressed_texture = style.getTexture(StyleSpec::FGIMG_PRESSED, tsrc, texture);
-
-               const core::position2di buttonCenter(AbsoluteRect.getCenter());
-               core::position2d<s32> geom(buttonCenter);
+               video::ITexture *texture = style.getTexture(StyleSpec::FGIMG,
+                               getTextureSource());
 
-               setForegroundImage(guiScalingImageButton(driver, texture, geom.X, geom.Y));
-               setHoveredForegroundImage(guiScalingImageButton(driver, hovered_texture, geom.X, geom.Y));
-               setPressedForegroundImage(guiScalingImageButton(driver, pressed_texture, geom.X, geom.Y));
+               setForegroundImage(guiScalingImageButton(driver, texture,
+                       AbsoluteRect.getWidth(), AbsoluteRect.getHeight()));
                setScaleImage(true);
+       } else {
+               setForegroundImage(nullptr);
        }
 }
 
@@ -132,11 +81,12 @@ void GUIButtonImage::setScaleImage(bool scaleImage)
 }
 
 GUIButtonImage *GUIButtonImage::addButton(IGUIEnvironment *environment,
-               const core::rect<s32> &rectangle, IGUIElement *parent, s32 id,
-               const wchar_t *text, const wchar_t *tooltiptext)
+               const core::rect<s32> &rectangle, ISimpleTextureSource *tsrc,
+               IGUIElement *parent, s32 id, const wchar_t *text,
+               const wchar_t *tooltiptext)
 {
        GUIButtonImage *button = new GUIButtonImage(environment,
-                       parent ? parent : environment->getRootGUIElement(), id, rectangle);
+                       parent ? parent : environment->getRootGUIElement(), id, rectangle, tsrc);
 
        if (text)
                button->setText(text);