From 44d9d278adc21c2461ae66efcd21acef9c9fdb8a Mon Sep 17 00:00:00 2001
From: "Sergei Ivanov (Districh)" <districh@ya.ru>
Date: Wed, 16 Oct 2024 18:03:42 +0300
Subject: [PATCH 1/5] Update the ui_button code

---
 src/fheroes2/gui/ui_button.cpp | 137 ++++++++-------------------------
 src/fheroes2/gui/ui_button.h   | 123 +++++++++++++++++++++--------
 2 files changed, 125 insertions(+), 135 deletions(-)

diff --git a/src/fheroes2/gui/ui_button.cpp b/src/fheroes2/gui/ui_button.cpp
index 52498427041..ad8348340a9 100644
--- a/src/fheroes2/gui/ui_button.cpp
+++ b/src/fheroes2/gui/ui_button.cpp
@@ -267,16 +267,6 @@ namespace
 
 namespace fheroes2
 {
-    ButtonBase::ButtonBase( const int32_t offsetX, const int32_t offsetY )
-        : _offsetX( offsetX )
-        , _offsetY( offsetY )
-        , _isPressed( false )
-        , _isEnabled( true )
-        , _isVisible( true )
-        , _releasedSprite( nullptr )
-        , _disabledSprite()
-    {}
-
     bool ButtonBase::press()
     {
         if ( !isEnabled() ) {
@@ -343,7 +333,7 @@ namespace fheroes2
         return true;
     }
 
-    bool ButtonBase::drawOnPress( Display & output )
+    bool ButtonBase::drawOnPress()
     {
         if ( isPressed() ) {
             return false;
@@ -354,13 +344,14 @@ namespace fheroes2
         }
 
         if ( isVisible() ) {
+            Display & output = Display::instance();
             draw( output );
             output.render( area() );
         }
         return true;
     }
 
-    bool ButtonBase::drawOnRelease( Display & output )
+    bool ButtonBase::drawOnRelease()
     {
         if ( !isPressed() ) {
             return false;
@@ -371,6 +362,7 @@ namespace fheroes2
         }
 
         if ( isVisible() ) {
+            Display & output = Display::instance();
             draw( output );
             output.render( area() );
         }
@@ -380,7 +372,7 @@ namespace fheroes2
     Rect ButtonBase::area() const
     {
         const Sprite & sprite = isPressed() ? _getPressed() : _getReleased();
-        return Rect( _offsetX + sprite.x(), _offsetY + sprite.y(), sprite.width(), sprite.height() );
+        return { _offsetX + sprite.x(), _offsetY + sprite.y(), sprite.width(), sprite.height() };
     }
 
     const Sprite & ButtonBase::_getDisabled() const
@@ -392,34 +384,7 @@ namespace fheroes2
             ApplyPalette( *_disabledSprite, PAL::GetPalette( PAL::PaletteType::DARKENING ) );
         }
 
-        return *_disabledSprite.get();
-    }
-
-    Button::Button( int32_t offsetX, int32_t offsetY )
-        : ButtonBase( offsetX, offsetY )
-        , _icnId( -1 )
-        , _releasedIndex( 0 )
-        , _pressedIndex( 0 )
-    {}
-
-    Button::Button( int32_t offsetX, int32_t offsetY, int icnId, uint32_t releasedIndex, uint32_t pressedIndex )
-        : ButtonBase( offsetX, offsetY )
-        , _icnId( icnId )
-        , _releasedIndex( releasedIndex )
-        , _pressedIndex( pressedIndex )
-    {}
-
-    void Button::setICNInfo( int icnId, uint32_t releasedIndex, uint32_t pressedIndex )
-    {
-        _icnId = icnId;
-        _releasedIndex = releasedIndex;
-        _pressedIndex = pressedIndex;
-    }
-
-    void Button::setICNIndexes( const uint32_t releasedIndex, const uint32_t pressedIndex )
-    {
-        _releasedIndex = releasedIndex;
-        _pressedIndex = pressedIndex;
+        return *_disabledSprite;
     }
 
     const Sprite & Button::_getPressed() const
@@ -432,24 +397,6 @@ namespace fheroes2
         return AGG::GetICN( _icnId, _releasedIndex );
     }
 
-    ButtonSprite::ButtonSprite( int32_t offsetX, int32_t offsetY )
-        : ButtonBase( offsetX, offsetY )
-    {}
-
-    ButtonSprite::ButtonSprite( int32_t offsetX, int32_t offsetY, Sprite released, Sprite pressed, Sprite disabled )
-        : ButtonBase( offsetX, offsetY )
-        , _released( std::move( released ) )
-        , _pressed( std::move( pressed ) )
-        , _disabled( std::move( disabled ) )
-    {}
-
-    void ButtonSprite::setSprite( const Sprite & released, const Sprite & pressed, const Sprite & disabled )
-    {
-        _released = released;
-        _pressed = pressed;
-        _disabled = disabled;
-    }
-
     const Sprite & ButtonSprite::_getPressed() const
     {
         return _pressed;
@@ -469,7 +416,7 @@ namespace fheroes2
         return _disabled;
     }
 
-    ButtonGroup::ButtonGroup( const Rect & area, int buttonTypes )
+    ButtonGroup::ButtonGroup( const Rect & area /* = Rect() */, const int buttonTypes /* = 0 */ )
     {
         const bool isEvilInterface = Settings::Get().isEvilInterfaceEnabled();
 
@@ -518,60 +465,39 @@ namespace fheroes2
         }
     }
 
-    ButtonGroup::~ButtonGroup()
-    {
-        for ( size_t i = 0; i < _button.size(); ++i ) {
-            delete _button[i];
-        }
-
-        _button.clear();
-        _value.clear();
-    }
-
-    void ButtonGroup::createButton( int32_t offsetX, int32_t offsetY, int icnId, uint32_t releasedIndex, uint32_t pressedIndex, int returnValue )
+    void ButtonGroup::createButton( const int32_t offsetX, const int32_t offsetY, const int icnId, const uint32_t releasedIndex, const uint32_t pressedIndex,
+                                    const int returnValue )
     {
-        _button.push_back( new Button( offsetX, offsetY, icnId, releasedIndex, pressedIndex ) );
+        _button.push_back( std::make_unique<Button>( offsetX, offsetY, icnId, releasedIndex, pressedIndex ) );
         _value.emplace_back( returnValue );
     }
 
-    void ButtonGroup::createButton( int32_t offsetX, int32_t offsetY, const Sprite & released, const Sprite & pressed, int returnValue )
+    void ButtonGroup::createButton( const int32_t offsetX, const int32_t offsetY, const Sprite & released, const Sprite & pressed, const int returnValue )
     {
-        _button.push_back( new ButtonSprite( offsetX, offsetY, released, pressed ) );
+        _button.push_back( std::make_unique<ButtonSprite>( offsetX, offsetY, released, pressed ) );
         _value.emplace_back( returnValue );
     }
 
-    void ButtonGroup::addButton( ButtonSprite && button, int returnValue )
+    void ButtonGroup::addButton( ButtonSprite && button, const int returnValue )
     {
-        _button.push_back( new ButtonSprite( std::move( button ) ) );
+        _button.push_back( std::make_unique<ButtonSprite>( std::move( button ) ) );
         _value.emplace_back( returnValue );
     }
 
-    void ButtonGroup::draw( Image & area ) const
+    void ButtonGroup::draw( Image & output /* = Display::instance() */ ) const
     {
-        for ( size_t i = 0; i < _button.size(); ++i ) {
-            _button[i]->draw( area );
+        for ( const auto & button : _button ) {
+            button->draw( output );
         }
     }
 
-    ButtonBase & ButtonGroup::button( size_t id )
-    {
-        assert( id < _button.size() );
-        return *_button[id];
-    }
-
-    const ButtonBase & ButtonGroup::button( size_t id ) const
-    {
-        assert( id < _button.size() );
-        return *_button[id];
-    }
-
     int ButtonGroup::processEvents()
     {
         LocalEvent & le = LocalEvent::Get();
 
-        for ( size_t i = 0; i < _button.size(); ++i ) {
-            if ( _button[i]->isEnabled() ) {
-                le.isMouseLeftButtonPressedInArea( _button[i]->area() ) ? _button[i]->drawOnPress() : _button[i]->drawOnRelease();
+        for ( const auto & button : _button ) {
+            if ( button->isEnabled() ) {
+                le.isMouseLeftButtonPressedInArea( button->area() ) ? button->drawOnPress() : button->drawOnRelease();
             }
         }
 
@@ -621,24 +547,29 @@ namespace fheroes2
 
     void OptionButtonGroup::addButton( ButtonBase * button )
     {
-        if ( button == nullptr )
+        if ( button == nullptr ) {
             return;
+        }
 
         _button.push_back( button );
         button->subscribe( this );
     }
 
-    void OptionButtonGroup::draw( Image & area ) const
+    void OptionButtonGroup::draw( Image & output /* = Display::instance() */ ) const
     {
-        for ( size_t i = 0; i < _button.size(); ++i ) {
-            _button[i]->draw( area );
+        for ( const ButtonBase * button : _button ) {
+            button->draw( output );
         }
     }
 
     void OptionButtonGroup::senderUpdate( const ActionObject * sender )
     {
-        if ( sender == nullptr ) // how is it even possible?
+        if ( sender == nullptr ) {
+            // How is it even possible?
+            assert( 0 );
+
             return;
+        }
 
         for ( size_t i = 0; i < _button.size(); ++i ) {
             if ( sender == _button[i] ) {
@@ -660,15 +591,15 @@ namespace fheroes2
 
     void OptionButtonGroup::subscribeAll()
     {
-        for ( size_t i = 0; i < _button.size(); ++i ) {
-            _button[i]->subscribe( this );
+        for ( ButtonBase * button : _button ) {
+            button->subscribe( this );
         }
     }
 
     void OptionButtonGroup::unsubscribeAll()
     {
-        for ( size_t i = 0; i < _button.size(); ++i ) {
-            _button[i]->unsubscribe();
+        for ( ButtonBase * button : _button ) {
+            button->unsubscribe();
         }
     }
 
diff --git a/src/fheroes2/gui/ui_button.h b/src/fheroes2/gui/ui_button.h
index bfb5065329f..6a353834bb0 100644
--- a/src/fheroes2/gui/ui_button.h
+++ b/src/fheroes2/gui/ui_button.h
@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include <cassert>
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -38,7 +39,13 @@ namespace fheroes2
     {
     public:
         ButtonBase() = default;
-        ButtonBase( const int32_t offsetX, const int32_t offsetY );
+        ButtonBase( const int32_t offsetX, const int32_t offsetY )
+            : _offsetX( offsetX )
+            , _offsetY( offsetY )
+        {
+            // Do nothing.
+        }
+
         ButtonBase( const ButtonBase & ) = delete;
         ButtonBase( ButtonBase && ) noexcept = default;
 
@@ -92,20 +99,20 @@ namespace fheroes2
 
         bool draw( Image & output = Display::instance() ) const; // will draw on screen by default
 
-        // Will draw on screen by default. Returns true in case of state change. This method calls render() internally.
-        bool drawOnPress( Display & output = Display::instance() );
+        // Will draw on screen. Returns true in case of state change. This method calls render() internally.
+        bool drawOnPress();
 
-        // Will draw on screen by default. Returns true in case of state change. This method calls render() internally.
-        bool drawOnRelease( Display & output = Display::instance() );
+        // Will draw on screen. Returns true in case of state change. This method calls render() internally.
+        bool drawOnRelease();
 
-        // Will draw on screen by default. Returns true in case of state change. This method calls render() internally.
-        bool drawOnState( const bool isPressedState, Display & output = Display::instance() )
+        // Will draw on screen. Returns true in case of state change. This method calls render() internally.
+        bool drawOnState( const bool isPressedState )
         {
             if ( isPressedState ) {
-                return drawOnPress( output );
+                return drawOnPress();
             }
 
-            return drawOnRelease( output );
+            return drawOnRelease();
         }
 
         Rect area() const;
@@ -127,32 +134,68 @@ namespace fheroes2
         mutable std::unique_ptr<Sprite> _disabledSprite;
     };
 
-    class Button : public ButtonBase
+    class Button final : public ButtonBase
     {
     public:
-        Button( int32_t offsetX = 0, int32_t offsetY = 0 );
-        Button( int32_t offsetX, int32_t offsetY, int icnId, uint32_t releasedIndex, uint32_t pressedIndex );
+        explicit Button( const int32_t offsetX = 0, const int32_t offsetY = 0 )
+            : ButtonBase( offsetX, offsetY )
+        {
+            // Do nothing.
+        }
+
+        Button( const int32_t offsetX, const int32_t offsetY, const int icnId, const uint32_t releasedIndex, const uint32_t pressedIndex )
+            : ButtonBase( offsetX, offsetY )
+            , _icnId( icnId )
+            , _releasedIndex( releasedIndex )
+            , _pressedIndex( pressedIndex )
+        {
+            // Do nothing.
+        }
+
         ~Button() override = default;
 
-        void setICNInfo( int icnId, uint32_t releasedIndex, uint32_t pressedIndex );
-        void setICNIndexes( const uint32_t releasedIndex, const uint32_t pressedIndex );
+        void setICNInfo( const int icnId, const uint32_t releasedIndex, const uint32_t pressedIndex )
+        {
+            _icnId = icnId;
+            _releasedIndex = releasedIndex;
+            _pressedIndex = pressedIndex;
+        }
+
+        void setICNIndexes( const uint32_t releasedIndex, const uint32_t pressedIndex )
+        {
+            _releasedIndex = releasedIndex;
+            _pressedIndex = pressedIndex;
+        }
 
     protected:
         const Sprite & _getPressed() const override;
         const Sprite & _getReleased() const override;
 
     private:
-        int _icnId;
-        uint32_t _releasedIndex;
-        uint32_t _pressedIndex;
+        int _icnId{ -1 };
+        uint32_t _releasedIndex{ 0 };
+        uint32_t _pressedIndex{ 0 };
     };
 
     // This button class is used for custom Sprites
-    class ButtonSprite : public ButtonBase
+    class ButtonSprite final : public ButtonBase
     {
     public:
-        ButtonSprite( int32_t offsetX = 0, int32_t offsetY = 0 );
-        ButtonSprite( int32_t offsetX, int32_t offsetY, Sprite released, Sprite pressed, Sprite disabled = Sprite() );
+        explicit ButtonSprite( const int32_t offsetX = 0, const int32_t offsetY = 0 )
+            : ButtonBase( offsetX, offsetY )
+        {
+            // Do nothing.
+        }
+
+        ButtonSprite( const int32_t offsetX, const int32_t offsetY, Sprite released, Sprite pressed, Sprite disabled = Sprite() )
+            : ButtonBase( offsetX, offsetY )
+            , _released( std::move( released ) )
+            , _pressed( std::move( pressed ) )
+            , _disabled( std::move( disabled ) )
+        {
+            // Do nothing.
+        }
+
         ButtonSprite( const ButtonSprite & ) = delete;
         ButtonSprite( ButtonSprite && ) noexcept = default;
 
@@ -161,7 +204,12 @@ namespace fheroes2
         ButtonSprite & operator=( const ButtonSprite & ) = delete;
         ButtonSprite & operator=( ButtonSprite && ) noexcept = default;
 
-        void setSprite( const Sprite & released, const Sprite & pressed, const Sprite & disabled = Sprite() );
+        void setSprite( const Sprite & released, const Sprite & pressed, const Sprite & disabled = Sprite() )
+        {
+            _released = released;
+            _pressed = pressed;
+            _disabled = disabled;
+        }
 
     protected:
         const Sprite & _getPressed() const override;
@@ -178,27 +226,38 @@ namespace fheroes2
     {
     public:
         // Please refer to dialog.h enumeration for states
-        ButtonGroup( const Rect & area = Rect(), int buttonTypes = 0 );
+        explicit ButtonGroup( const Rect & area = Rect(), const int buttonTypes = 0 );
         ButtonGroup( const ButtonGroup & ) = delete;
 
-        ~ButtonGroup();
+        ~ButtonGroup() = default;
 
         ButtonGroup & operator=( const ButtonGroup & ) = delete;
 
-        void createButton( int32_t offsetX, int32_t offsetY, int icnId, uint32_t releasedIndex, uint32_t pressedIndex, int returnValue );
-        void createButton( int32_t offsetX, int32_t offsetY, const Sprite & released, const Sprite & pressed, int returnValue );
-        void addButton( ButtonSprite && button, int returnValue );
+        void createButton( const int32_t offsetX, const int32_t offsetY, const int icnId, const uint32_t releasedIndex, const uint32_t pressedIndex,
+                           const int returnValue );
+        void createButton( const int32_t offsetX, const int32_t offsetY, const Sprite & released, const Sprite & pressed, const int returnValue );
+        void addButton( ButtonSprite && button, const int returnValue );
 
-        void draw( Image & area = Display::instance() ) const; // will draw on screen by default
+        // Will draw on screen by default.
+        void draw( Image & output = Display::instance() ) const;
 
         // Make sure that id is less than size!
-        ButtonBase & button( size_t id );
-        const ButtonBase & button( size_t id ) const;
+        ButtonBase & button( const size_t id )
+        {
+            assert( id < _button.size() );
+            return *_button[id];
+        }
+
+        const ButtonBase & button( const size_t id ) const
+        {
+            assert( id < _button.size() );
+            return *_button[id];
+        }
 
         int processEvents();
 
     private:
-        std::vector<ButtonBase *> _button;
+        std::vector<std::unique_ptr<ButtonBase>> _button;
         std::vector<int> _value;
     };
 
@@ -219,12 +278,12 @@ namespace fheroes2
         bool _isEnabled;
     };
 
-    class OptionButtonGroup : public ActionObject
+    class OptionButtonGroup final : public ActionObject
     {
     public:
         void addButton( ButtonBase * button );
 
-        void draw( Image & area = Display::instance() ) const; // will draw on screen by default
+        void draw( Image & output = Display::instance() ) const; // will draw on screen by default
 
     protected:
         void senderUpdate( const ActionObject * sender ) override;

From 2e5c6ac5ece950689d7736c177cd249615f33b61 Mon Sep 17 00:00:00 2001
From: "Sergei Ivanov (Districh)" <districh@ya.ru>
Date: Wed, 16 Oct 2024 21:21:11 +0300
Subject: [PATCH 2/5] Apply IWYU suggestion

---
 src/fheroes2/gui/ui_button.cpp | 1 -
 src/fheroes2/gui/ui_button.h   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fheroes2/gui/ui_button.cpp b/src/fheroes2/gui/ui_button.cpp
index ad8348340a9..31a0b7065ee 100644
--- a/src/fheroes2/gui/ui_button.cpp
+++ b/src/fheroes2/gui/ui_button.cpp
@@ -22,7 +22,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <utility>
 
 #include "agg_image.h"
 #include "dialog.h"
diff --git a/src/fheroes2/gui/ui_button.h b/src/fheroes2/gui/ui_button.h
index 6a353834bb0..186abb0e1ee 100644
--- a/src/fheroes2/gui/ui_button.h
+++ b/src/fheroes2/gui/ui_button.h
@@ -25,6 +25,7 @@
 #include <cstdint>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "image.h"

From 9af1aa0e24833f968e6451328dac469c3e0c1ed3 Mon Sep 17 00:00:00 2001
From: "Sergei Ivanov (Districh)" <districh@ya.ru>
Date: Wed, 16 Oct 2024 21:39:34 +0300
Subject: [PATCH 3/5] Update comments

---
 src/fheroes2/gui/ui_button.h | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/fheroes2/gui/ui_button.h b/src/fheroes2/gui/ui_button.h
index 186abb0e1ee..9b117c16af9 100644
--- a/src/fheroes2/gui/ui_button.h
+++ b/src/fheroes2/gui/ui_button.h
@@ -88,17 +88,21 @@ namespace fheroes2
         bool press();
         bool release();
         void enable();
-        void disable(); // button becomes disabled and released
-        void show(); // this method doesn't call draw
-        void hide(); // this method doesn't call draw
-
-        void setPosition( const int32_t offsetX_, const int32_t offsetY_ )
+        // Button becomes disabled and released
+        void disable();
+        // This method doesn't call draw()
+        void show();
+        // This method doesn't call draw()
+        void hide();
+
+        void setPosition( const int32_t offsetX, const int32_t offsetY )
         {
-            _offsetX = offsetX_;
-            _offsetY = offsetY_;
+            _offsetX = offsetX;
+            _offsetY = offsetY;
         }
 
-        bool draw( Image & output = Display::instance() ) const; // will draw on screen by default
+        // Will draw on screen by default
+        bool draw( Image & output = Display::instance() ) const;
 
         // Will draw on screen. Returns true in case of state change. This method calls render() internally.
         bool drawOnPress();
@@ -239,7 +243,7 @@ namespace fheroes2
         void createButton( const int32_t offsetX, const int32_t offsetY, const Sprite & released, const Sprite & pressed, const int returnValue );
         void addButton( ButtonSprite && button, const int returnValue );
 
-        // Will draw on screen by default.
+        // Will draw on screen by default
         void draw( Image & output = Display::instance() ) const;
 
         // Make sure that id is less than size!
@@ -284,7 +288,8 @@ namespace fheroes2
     public:
         void addButton( ButtonBase * button );
 
-        void draw( Image & output = Display::instance() ) const; // will draw on screen by default
+        // Will draw on screen by default
+        void draw( Image & output = Display::instance() ) const;
 
     protected:
         void senderUpdate( const ActionObject * sender ) override;

From 80f36800762fadb6e63cdf2c930a00544cd1eb2c Mon Sep 17 00:00:00 2001
From: "Sergei Ivanov (Districh)" <districh@ya.ru>
Date: Sun, 20 Oct 2024 16:24:31 +0300
Subject: [PATCH 4/5] REvert changes to drawOnPress(), drawOnRelease() and
 drawOnState()

---
 src/fheroes2/gui/ui_button.cpp |  6 ++----
 src/fheroes2/gui/ui_button.h   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/fheroes2/gui/ui_button.cpp b/src/fheroes2/gui/ui_button.cpp
index 2c151599c6b..c37f8f1e374 100644
--- a/src/fheroes2/gui/ui_button.cpp
+++ b/src/fheroes2/gui/ui_button.cpp
@@ -332,7 +332,7 @@ namespace fheroes2
         return true;
     }
 
-    bool ButtonBase::drawOnPress()
+    bool ButtonBase::drawOnPress( Display & output /* = Display::instance() */ )
     {
         if ( isPressed() ) {
             return false;
@@ -343,7 +343,6 @@ namespace fheroes2
         }
 
         if ( isVisible() ) {
-            Display & output = Display::instance();
             draw( output );
 
             output.render( area() );
@@ -351,7 +350,7 @@ namespace fheroes2
         return true;
     }
 
-    bool ButtonBase::drawOnRelease()
+    bool ButtonBase::drawOnRelease( Display & output /* = Display::instance() */ )
     {
         if ( !isPressed() ) {
             return false;
@@ -362,7 +361,6 @@ namespace fheroes2
         }
 
         if ( isVisible() ) {
-            Display & output = Display::instance();
             draw( output );
 
             output.render( area() );
diff --git a/src/fheroes2/gui/ui_button.h b/src/fheroes2/gui/ui_button.h
index 9b117c16af9..c8768a52541 100644
--- a/src/fheroes2/gui/ui_button.h
+++ b/src/fheroes2/gui/ui_button.h
@@ -104,20 +104,20 @@ namespace fheroes2
         // Will draw on screen by default
         bool draw( Image & output = Display::instance() ) const;
 
-        // Will draw on screen. Returns true in case of state change. This method calls render() internally.
-        bool drawOnPress();
+        // Will draw and render on screen by default. Returns true in case of state change. This method calls render() internally.
+        bool drawOnPress( Display & output = Display::instance() );
 
-        // Will draw on screen. Returns true in case of state change. This method calls render() internally.
-        bool drawOnRelease();
+        // Will draw and render on screen by default. Returns true in case of state change. This method calls render() internally.
+        bool drawOnRelease( Display & output = Display::instance() );
 
-        // Will draw on screen. Returns true in case of state change. This method calls render() internally.
-        bool drawOnState( const bool isPressedState )
+        // Will draw and render on screen by default. Returns true in case of state change. This method calls render() internally.
+        bool drawOnState( const bool isPressedState, Display & output = Display::instance() )
         {
             if ( isPressedState ) {
-                return drawOnPress();
+                return drawOnPress( output );
             }
 
-            return drawOnRelease();
+            return drawOnRelease( output );
         }
 
         Rect area() const;

From 6c4873673a0dc8d18b7b3a58aab6464826d0e58c Mon Sep 17 00:00:00 2001
From: "Sergei Ivanov (Districh)" <districh@ya.ru>
Date: Mon, 21 Oct 2024 18:22:08 +0300
Subject: [PATCH 5/5] Address comments

---
 src/fheroes2/gui/ui_button.cpp | 2 +-
 src/fheroes2/gui/ui_button.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fheroes2/gui/ui_button.cpp b/src/fheroes2/gui/ui_button.cpp
index c37f8f1e374..c8443070f32 100644
--- a/src/fheroes2/gui/ui_button.cpp
+++ b/src/fheroes2/gui/ui_button.cpp
@@ -496,7 +496,7 @@ namespace fheroes2
 
         for ( const auto & button : _button ) {
             if ( button->isEnabled() ) {
-                le.isMouseLeftButtonPressedInArea( button->area() ) ? button->drawOnPress() : button->drawOnRelease();
+                button->drawOnState( le.isMouseLeftButtonPressedInArea( button->area() ) );
             }
         }
 
diff --git a/src/fheroes2/gui/ui_button.h b/src/fheroes2/gui/ui_button.h
index c8768a52541..008f6a68568 100644
--- a/src/fheroes2/gui/ui_button.h
+++ b/src/fheroes2/gui/ui_button.h
@@ -192,7 +192,7 @@ namespace fheroes2
             // Do nothing.
         }
 
-        ButtonSprite( const int32_t offsetX, const int32_t offsetY, Sprite released, Sprite pressed, Sprite disabled = Sprite() )
+        ButtonSprite( const int32_t offsetX, const int32_t offsetY, Sprite released, Sprite pressed, Sprite disabled = {} )
             : ButtonBase( offsetX, offsetY )
             , _released( std::move( released ) )
             , _pressed( std::move( pressed ) )
@@ -209,7 +209,7 @@ namespace fheroes2
         ButtonSprite & operator=( const ButtonSprite & ) = delete;
         ButtonSprite & operator=( ButtonSprite && ) noexcept = default;
 
-        void setSprite( const Sprite & released, const Sprite & pressed, const Sprite & disabled = Sprite() )
+        void setSprite( const Sprite & released, const Sprite & pressed, const Sprite & disabled = {} )
         {
             _released = released;
             _pressed = pressed;