Refactor in a good state

WidgetsNew/public/DockLayoutWidget.hpp

@@ -0,0 +1,94 @@
+#include "Widget.hpp"
+
+namespace tp {
+	class DockLayoutWidget : public Widget {
+	public:
+		enum Side { LEFT, TOP, RIGHT, BOTTOM, NONE  };
+
+	private:
+		struct ResizeHandle {
+			RectF area{ 0, 0, 0, 0 };
+			halnf start{ 0 };
+			halnf end{ 0 };
+			bool active = false;
+			bool hover = false;
+		};
+
+		struct SideWidgetData {
+			Widget* widget = nullptr;
+			bool hidden = false;
+			halnf absoluteSize = 200;
+			alni order = -1;
+
+			Side side = { TOP };
+
+			RectF area = {};
+			RectF headerArea = {};
+			RectF previewHandleArea = {};
+
+			ResizeHandle resizeHandle;
+		};
+
+	public:
+		DockLayoutWidget();
+
+	public:
+		void adjustRect() override {}
+		void adjustChildrenRect() override {}
+
+		void process(const EventHandler& events) override;
+		void draw(Canvas& canvas) override;
+		void drawOverlay(Canvas& canvas) override;
+
+		[[nodiscard]] bool propagateEventsToChildren() const override;
+		[[nodiscard]] bool needsNextFrame() const override;
+
+	public:
+		void setCenterWidget(Widget* widget);
+
+		void dockWidget(Widget* widget, Side side);
+		void undockWidget(Side side);
+		void toggleWidgetVisibility(Side side);
+
+	private:
+		void calculateSideAreas();
+		void calculateResizeHandles();
+		void handleResizeEvents(const EventHandler& events);
+		void updateChildSideWidgets();
+
+		void calculateHeaderAreas();
+
+		bool isSideVisible(Side side);
+		bool sideExists(DockLayoutWidget::Side side);
+		ualni getVisibleSidesSize();
+		void handlePreview(const EventHandler& events);
+
+	private:
+		RectF mPreviewArea = {};
+		Side mPreviewSide = NONE;
+		int resizeType[2] = { 0, 0 };
+
+		SideWidgetData mSideWidgets[4];
+
+	private:
+		bool mResizing = false;
+
+		Widget* mCenterWidget = nullptr;
+		RectF mCenterArea {};
+
+		// Parameters
+		halnf mSideSizePadding = 150.f;
+		halnf mPadding = 4;
+		halnf mHeaderSize = 27;
+		halnf mRounding = 10;
+		Vec2F mPreviewHandleSize = { 50, 50 };
+
+		RGBA mResizeHandleColorHovered = RGBA(0.3, 0.3, 0.3, 1);
+		RGBA mResizeHandleColorActive = RGBA(0.6, 0.6, 0.6, 1);
+		RGBA mBackgroundColor = RGBA(0, 0, 0, 1);
+		RGBA mPreviewColor = RGBA(0.6, 0.6, 0.6, 1);
+
+	public:
+		bool mPreview = false;
+	};
+}

WidgetsNew/public/FloatingWidget.hpp

@@ -18,7 +18,7 @@ namespace tp {
 
 		RectF resizeHandleRect();
 
-		bool propagateEventsToChildren() const override;
+		[[nodiscard]] bool propagateEventsToChildren() const override;
 
 	private:
 		bool mIsFloating = false;
@@ -41,8 +41,6 @@ namespace tp {
 			mMenuLayout.addChild(&mHeader);
 			mMenuLayout.addChild(&mBodyLayout);
 
-			addToMenu(&mTestButton);
-
 			mHeader.setText("Menu");
 		}
 

WidgetsNew/public/RootWidget.hpp

@@ -33,7 +33,7 @@ namespace tp {
 		void updateTreeToProcess();
 		void updateAnimations(ActiveTreeNode* iter);
 		void drawRecursion(Canvas& canvas, Widget* active, const Vec2F& pos);
-		void drawDebug(Canvas& canvas, Widget* active, const Vec2F& pos);
+		void drawDebug(Canvas& canvas, Widget* active, const Vec2F& pos, int depthOrder);
 		void findFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer);
 		void handleFocusChanges(EventHandler& events);
 		void getWidgetPath(Widget* widget, std::vector<Widget*>& out);
@@ -50,6 +50,6 @@ namespace tp {
 		std::map<Widget*, ActiveTreeNode> mWidgetsToProcess;
 		Widget* mInFocusWidget = nullptr;
 
-		bool mDebug = false;
+		bool mDebug = true;
 	};
 }

WidgetsNew/public/SimpleWidgets.hpp

@@ -45,6 +45,8 @@ namespace tp {
 		void endAnimations() override;
 		void updateAnimations() override;
 
+		void setColor(const RGBA& in);
+
 	private:
 		std::function<void()> mAction;
 

WidgetsNew/public/Widget.hpp

@@ -22,18 +22,15 @@ namespace tp {
 			mDebugColor = col;
 		}
 
-		void addChild(Widget* child) {
-			mChildren.push_back(child);
-			child->mParent = this;
-
-			triggerWidgetUpdate();
-			child->triggerWidgetUpdate();
-		}
+		void addChild(Widget* child);
 
 		WidgetManagerInterface* getRoot();
 
 		void triggerWidgetUpdate();
 
+		void bringToFront();
+		void bringToBack();
+
 	public:
 		virtual void process(const EventHandler& events) {}
 		virtual void draw(Canvas& canvas) { canvas.rect(mArea.getCurrentRect(), RGBA(1.f), 10); }
@@ -63,12 +60,11 @@ namespace tp {
 		Widget* mParent = nullptr;
 
 		std::vector<Widget*> mChildren;
+		List<Widget*> mDepthOrder;
 
 		// relative to the parent
 		SpringRect mArea;
 
-		ualni mZValue = 0;
-
 		bool mInFocus = false;
 
 		// debug