Override SetInteractable and SetBlockInput in all composite objects...

Override SetInteractable and SetBlockInput in all composite objects (PZ3A8l51R6)
Neko-Box-Coder · May 14, 2023 · 4df2067 · 4df2067
1 parent e50102a
commit 4df2067
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 1 deletion.
diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.hpp
@@ -206,14 +206,22 @@ namespace ssGUI
             //Passing nullptr will unset the dropdown menu object.
             virtual void SetDropdownMenu(ssGUI::Menu* menu);
 
+            //function: SetInteractable
+            //See <Widget::SetInteractable>
+            virtual void SetInteractable(bool interactable) override;
+
+            //function: SetBlockInput
+            //See <Widget::SetBlockInput>
+            virtual void SetBlockInput(bool blockInput) override;
+
             //function: GetType
             //See <Widget::GetType>
             virtual ssGUI::Enums::GUIObjectType GetType() const override;
 
             //function: Clone
             //See <Widget::Clone>
             virtual Dropdown* Clone(bool cloneChildren) override;
-            
+
             //function: InitiateDefaultResources
             //See <GUIObject::InitiateDefaultResources>
             virtual void InitiateDefaultResources() override;

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.hpp
@@ -442,6 +442,14 @@ namespace ssGUI
             //For description of SetImageData, see <ssGUI::Image::SetImageData>
             virtual void SetImageData(ssGUI::ImageData* imageData) override;
 
+            //function: SetInteractable
+            //See <Widget::SetInteractable>
+            virtual void SetInteractable(bool interactable) override;
+
+            //function: SetBlockInput
+            //See <Widget::SetBlockInput>
+            virtual void SetBlockInput(bool blockInput) override;
+
             //function: GetType
             //See <ssGUI::Widget::GetType>
             virtual ssGUI::Enums::GUIObjectType GetType() const override;

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/Slider.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/Slider.hpp
@@ -272,6 +272,14 @@ namespace ssGUI
             //This only limits to move in an interval so this is different from snapping.
             virtual float GetKeyInputMoveInterval() const;
 
+            //function: SetInteractable
+            //See <Widget::SetInteractable>
+            virtual void SetInteractable(bool interactable) override;
+
+            //function: SetBlockInput
+            //See <Widget::SetBlockInput>
+            virtual void SetBlockInput(bool blockInput) override;
+
             //function: GetType
             //See <Widget::GetType>
             virtual ssGUI::Enums::GUIObjectType GetType() const override;

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.hpp
@@ -258,6 +258,14 @@ namespace ssGUI
             //function: SetButtonColor
             //See <Button::SetButtonColor>
             virtual void SetButtonColor(glm::u8vec4 color) override;
+
+            //function: SetInteractable
+            //See <Widget::SetInteractable>
+            virtual void SetInteractable(bool interactable) override;
+
+            //function: SetBlockInput
+            //See <Widget::SetBlockInput>
+            virtual void SetBlockInput(bool blockInput) override;
 
             //function: GetType
             //See <Widget::GetType>

diff --git a/Src/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.cpp b/Src/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.cpp
@@ -314,6 +314,22 @@ namespace ssGUI
         for(int i = 0; i < itemsCopy.size(); i++)
             AddItem(itemsCopy[i].first);
     }
+
+    void Dropdown::SetInteractable(bool interactable)
+    {
+        if(GetDropdownMenu() != nullptr)
+            GetDropdownMenu()->SetInteractable(interactable);
+
+        StandardButton::SetInteractable(interactable);
+    }
+
+    void Dropdown::SetBlockInput(bool blockInput)
+    {
+        if(GetDropdownMenu() != nullptr)
+            GetDropdownMenu()->SetBlockInput(blockInput);
+
+        StandardButton::SetBlockInput(blockInput);
+    }
 
     ssGUI::Enums::GUIObjectType Dropdown::GetType() const
     {

diff --git a/Src/ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.cpp b/Src/ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.cpp
@@ -798,6 +798,28 @@ namespace ssGUI
         ssGUI::Image::SetImageData(imageData);
         CenterViewportToImage();
     }
+
+    void ImageCanvas::SetInteractable(bool interactable)
+    {
+        if(GetHorizontalScrollbar() != nullptr)
+            GetHorizontalScrollbar()->SetInteractable(interactable);
+
+        if(GetVerticalScrollbar() != nullptr)
+            GetVerticalScrollbar()->SetInteractable(interactable);
+
+        Image::SetInteractable(interactable);
+    }
+
+    void ImageCanvas::SetBlockInput(bool blockInput)
+    {
+        if(GetHorizontalScrollbar() != nullptr)
+            GetHorizontalScrollbar()->SetBlockInput(blockInput);
+
+        if(GetVerticalScrollbar() != nullptr)
+            GetVerticalScrollbar()->SetBlockInput(blockInput);
+
+        Image::SetBlockInput(blockInput);
+    }
 
     ssGUI::Enums::GUIObjectType ImageCanvas::GetType() const
     {

diff --git a/Src/ssGUI/GUIObjectClasses/CompositeClasses/Slider.cpp b/Src/ssGUI/GUIObjectClasses/CompositeClasses/Slider.cpp
@@ -664,6 +664,22 @@ namespace ssGUI
     {
         return KeyInputInterval;
     }
+
+    void Slider::SetInteractable(bool interactable)
+    {
+        if(GetKnobObject() != nullptr)
+            GetKnobObject()->SetInteractable(interactable);
+
+        Widget::SetInteractable(interactable);
+    }
+
+    void Slider::SetBlockInput(bool blockInput)
+    {
+        if(GetKnobObject() != nullptr)
+            GetKnobObject()->SetBlockInput(blockInput);
+
+        Widget::SetBlockInput(blockInput);
+    }
 
     ssGUI::Enums::GUIObjectType Slider::GetType() const
     {

diff --git a/Src/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.cpp b/Src/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.cpp
@@ -434,6 +434,25 @@ namespace ssGUI
         GetButtonTextObject()->SetNewTextColor(glm::u8vec4((uint8_t)textResult.r, (uint8_t)textResult.g, (uint8_t)textResult.b, (uint8_t)textResult.a));
         GetButtonTextObject()->ApplyNewTextSettingsToExistingText();
     }
+
+    void StandardButton::SetInteractable(bool interactable)
+    {
+        if(GetButtonTextObject() != nullptr)
+            GetButtonTextObject()->SetInteractable(interactable);
+
+        if(GetButtonIconObject() != nullptr)
+            GetButtonIconObject()->SetInteractable(interactable);
+
+        Button::SetInteractable(interactable);
+    }
+
+    void StandardButton::SetBlockInput(bool blockInput)
+    {
+        if(GetButtonIconObject() != nullptr)
+            GetButtonIconObject()->SetBlockInput(blockInput);
+
+        Button::SetBlockInput(blockInput);
+    }
 
     ssGUI::Enums::GUIObjectType StandardButton::GetType() const
     {