Updated last input status to be not const

Neko-Box-Coder · Sep 15, 2023 · e8d5772 · e8d5772
1 parent 5358f4e
commit e8d5772
Show file tree

Hide file tree

Showing 61 changed files with 109 additions and 66 deletions.
diff --git a/Include/ssGUI/DataClasses/DragData.hpp b/Include/ssGUI/DataClasses/DragData.hpp
@@ -29,6 +29,7 @@ namespace ssGUI
         private:
             ssGUI::Enums::DragDataType CurrentDragDataType = ssGUI::Enums::DragDataType::NONE;
             std::string CustomDataIdentifier = "";
+            ssGUI::GUIObject* Interceptor = nullptr;
 
             union 
             {
@@ -61,6 +62,18 @@ namespace ssGUI
             //Sets the drag data for custom data
             void SetDragData(void* data);
 
+            //function: SetInterceptor
+            //Sets the interceptor for the current drag data, setting nullptr to unset it
+            void SetInterceptor(ssGUI::GUIObject* interceptor);
+
+            //function: IsIntercepted
+            //Returns if the current drag data is being intercepted
+            bool IsIntercepted() const;
+
+            //function: GetInterceptor
+            //Returns the GUI Object that has intercepted the current drag data, nullptr if none.
+            ssGUI::GUIObject* GetInterceptor() const;
+
             //function: GetDragData
             //Sets the drag data for the corresponding data type. 
             //To see which data type, call <GetDragDataType>

diff --git a/Include/ssGUI/DataClasses/EventInfo.hpp b/Include/ssGUI/DataClasses/EventInfo.hpp
@@ -23,7 +23,7 @@ namespace ssGUI
         ssGUI::InputStatus& CurrentInputStatus;
 
         //var: LastInputStatus
-        const ssGUI::InputStatus& LastInputStatus;
+        ssGUI::InputStatus& LastInputStatus;
 
         //var: MainWindow
         ssGUI::GUIObject* MainWindow;

diff --git a/Include/ssGUI/Extensions/AdvancedPosition.hpp b/Include/ssGUI/Extensions/AdvancedPosition.hpp
@@ -150,7 +150,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/AdvancedSize.hpp b/Include/ssGUI/Extensions/AdvancedSize.hpp
@@ -132,7 +132,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Border.hpp b/Include/ssGUI/Extensions/Border.hpp
@@ -124,7 +124,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/BoxShadow.hpp b/Include/ssGUI/Extensions/BoxShadow.hpp
@@ -134,7 +134,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/DockableV2.hpp b/Include/ssGUI/Extensions/DockableV2.hpp
@@ -139,7 +139,7 @@ namespace Extensions
 
             virtual void AttemptUndockingFromGUI(   ssGUI::Window* containerWindow, 
                                                     ssGUI::MainWindow* mainWindow,
-                                                    const ssGUI::InputStatus& lastInputStatus);
+                                                    ssGUI::InputStatus& lastInputStatus);
 
             virtual bool IsAttemptingToUndockFromGUI();
 
@@ -351,7 +351,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/DockingArea.hpp b/Include/ssGUI/Extensions/DockingArea.hpp
@@ -199,7 +199,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Extension.hpp b/Include/ssGUI/Extensions/Extension.hpp
@@ -60,7 +60,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) = 0;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Layout.hpp b/Include/ssGUI/Extensions/Layout.hpp
@@ -303,7 +303,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Legacy/Dockable.hpp b/Include/ssGUI/Extensions/Legacy/Dockable.hpp
@@ -274,7 +274,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Legacy/Docker.hpp b/Include/ssGUI/Extensions/Legacy/Docker.hpp
@@ -201,7 +201,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Mask.hpp b/Include/ssGUI/Extensions/Mask.hpp
@@ -220,7 +220,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/MaskEnforcer.hpp b/Include/ssGUI/Extensions/MaskEnforcer.hpp
@@ -115,7 +115,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Outline.hpp b/Include/ssGUI/Extensions/Outline.hpp
@@ -213,7 +213,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/RoundedCorners.hpp b/Include/ssGUI/Extensions/RoundedCorners.hpp
@@ -165,7 +165,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/Shape.hpp b/Include/ssGUI/Extensions/Shape.hpp
@@ -347,7 +347,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/TemplateExtension.hpp b/Include/ssGUI/Extensions/TemplateExtension.hpp
@@ -75,7 +75,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/Extensions/WindowLayoutItemEnforcer.hpp b/Include/ssGUI/Extensions/WindowLayoutItemEnforcer.hpp
@@ -79,7 +79,7 @@ namespace Extensions
             virtual void Internal_Update(   bool isPreUpdate, 
                                             ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Internal_Draw

diff --git a/Include/ssGUI/GUIObjectClasses/Button.hpp b/Include/ssGUI/GUIObjectClasses/Button.hpp
@@ -76,7 +76,7 @@ namespace ssGUI
             virtual void SetButtonState(ssGUI::Enums::ButtonState state);
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.hpp
@@ -154,7 +154,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/ImageCanvas.hpp
@@ -248,7 +248,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
         public:
             //====================================================================

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/MenuItem.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/MenuItem.hpp
@@ -85,7 +85,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Include/ssGUI/GUIObjectClasses/CompositeClasses/Slider.hpp b/Include/ssGUI/GUIObjectClasses/CompositeClasses/Slider.hpp
@@ -169,7 +169,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
         public:
             //string: ListenerKey

diff --git a/Include/ssGUI/GUIObjectClasses/GUIObject.hpp b/Include/ssGUI/GUIObjectClasses/GUIObject.hpp
@@ -66,7 +66,7 @@ namespace ssGUI
                                                 ssGUI::GUIObject* mainWindow);
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow);
 
         public:
@@ -118,7 +118,7 @@ namespace ssGUI
             //(Internal ssGUI function) Update function called by <ssGUIManager>
             virtual void Internal_Update(   ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow);
 
             //function: Clone

diff --git a/Include/ssGUI/GUIObjectClasses/MainWindow.hpp b/Include/ssGUI/GUIObjectClasses/MainWindow.hpp
@@ -56,7 +56,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:
@@ -269,7 +269,7 @@ namespace ssGUI
             //See <GUIObject::Internal_Update>
             virtual void Internal_Update(   ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                             ssGUI::InputStatus& currentInputStatus, 
-                                            const ssGUI::InputStatus& lastInputStatus, 
+                                            ssGUI::InputStatus& lastInputStatus, 
                                             ssGUI::GUIObject* mainWindow) override;
 
             //function: Clone

diff --git a/Include/ssGUI/GUIObjectClasses/Menu.hpp b/Include/ssGUI/GUIObjectClasses/Menu.hpp
@@ -64,7 +64,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Include/ssGUI/GUIObjectClasses/Text.hpp b/Include/ssGUI/GUIObjectClasses/Text.hpp
@@ -242,7 +242,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Include/ssGUI/GUIObjectClasses/TextField.hpp b/Include/ssGUI/GUIObjectClasses/TextField.hpp
@@ -96,7 +96,7 @@ namespace ssGUI
 
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Include/ssGUI/GUIObjectClasses/Widget.hpp b/Include/ssGUI/GUIObjectClasses/Widget.hpp
@@ -37,7 +37,7 @@ namespace ssGUI
             virtual void ConstructRenderInfo() override;
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Include/ssGUI/GUIObjectClasses/Window.hpp b/Include/ssGUI/GUIObjectClasses/Window.hpp
@@ -115,7 +115,7 @@ namespace ssGUI
             virtual void ConstructRenderInfo() override;
             virtual void MainLogic( ssGUI::Backend::BackendSystemInputInterface* inputInterface, 
                                     ssGUI::InputStatus& currentInputStatus, 
-                                    const ssGUI::InputStatus& lastInputStatus, 
+                                    ssGUI::InputStatus& lastInputStatus, 
                                     ssGUI::GUIObject* mainWindow) override;
 
         public:

diff --git a/Src/ssGUI/DataClasses/DragData.cpp b/Src/ssGUI/DataClasses/DragData.cpp
@@ -36,6 +36,21 @@ namespace ssGUI
         CurrentDragDataType = ssGUI::Enums::DragDataType::CUSTOM;
     }
 
+    void DragData::SetInterceptor(ssGUI::GUIObject* interceptor)
+    {
+        Interceptor = interceptor;
+    }
+
+    bool DragData::IsIntercepted() const
+    {
+        return Interceptor != nullptr;
+    }
+
+    ssGUI::GUIObject* DragData::GetInterceptor() const
+    {
+        return Interceptor;
+    }
+
     template<>
     ssGUI::GUIObject* DragData::GetDragData() const
     {