f

etorth · Nov 19, 2024 · 03964d9 · 03964d9
1 parent 44c58dc
commit 03964d9
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 10 deletions.
diff --git a/client/src/margincontainer.hpp b/client/src/margincontainer.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "widget.hpp"
+#include "shapeclipboard.hpp"
 
 class MarginContainer: public Widget
 {
@@ -20,6 +21,8 @@ class MarginContainer: public Widget
                 Widget::VarDir argWidgetDir,
                 bool           argWidgetAutoDelete,
 
+                std::function<void(const Widget *, int, int)> argDrawFunc = nullptr,
+
                 Widget *argParent     = nullptr,
                 bool    argAutoDelete = false)
 
@@ -39,7 +42,21 @@ class MarginContainer: public Widget
 
             , m_widgetDir(std::move(argWidgetDir))
         {
-            addChild(argWidget, [this](const Widget *)
+            Widget::addChild(new ShapeClipBoard
+            {
+                DIR_UPLEFT,
+                0,
+                0,
+
+                [this](const Widget *){ return w(); },
+                [this](const Widget *){ return h(); },
+
+                std::move(argDrawFunc),
+            },
+
+            true);
+
+            Widget::addChild(argWidget, [this](const Widget *)
             {
                 return Widget::evalDir(m_widgetDir, this);
             },
@@ -88,6 +105,6 @@ class MarginContainer: public Widget
         void addChild(Widget *, Widget::VarDir, Widget::VarOff, Widget::VarOff, bool) override { throw fflreach(); }
 
     public:
-        const Widget *contained() const { return firstChild(); }
-        /* */ Widget *contained()       { return firstChild(); }
+        const Widget *contained() const { return lastChild(); }
+        /* */ Widget *contained()       { return lastChild(); }
 };
diff --git a/client/src/marginwrapper.hpp b/client/src/marginwrapper.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "widget.hpp"
+#include "shapeclipboard.hpp"
 
 class MarginWrapper: public Widget
 {
@@ -13,6 +14,7 @@ class MarginWrapper: public Widget
                 bool    argWidgetAutoDelete,
 
                 std::array<int, 4> argMargin = {},
+                std::function<void(const Widget *, int, int)> argDrawFunc = nullptr,
 
                 Widget *argParent     = nullptr,
                 bool    argAutoDelete = false)
@@ -26,14 +28,34 @@ class MarginWrapper: public Widget
                   [argWidget, argMargin](const Widget *){ return argWidget->w() + std::max<int>(argMargin[2], 0) + std::max<int>(argMargin[3], 0); },
                   [argWidget, argMargin](const Widget *){ return argWidget->h() + std::max<int>(argMargin[0], 0) + std::max<int>(argMargin[1], 0); },
 
-                  {
-                      {argWidget, DIR_UPLEFT, std::max<int>(argMargin[2], 0), std::max<int>(argMargin[0], 0), argWidgetAutoDelete},
-                  },
+                  {},
 
                   argParent,
                   argAutoDelete,
               }
-        {}
+        {
+            Widget::addChild(new ShapeClipBoard
+            {
+                DIR_UPLEFT,
+                0,
+                0,
+
+                [this](const Widget *){ return w(); },
+                [this](const Widget *){ return h(); },
+
+                std::move(argDrawFunc),
+            },
+
+            true);
+
+            Widget::addChild(argWidget,
+                    DIR_UPLEFT,
+
+                    std::max<int>(argMargin[2], 0),
+                    std::max<int>(argMargin[0], 0),
+
+                    argWidgetAutoDelete);
+        }
 
     public:
         bool processEventDefault(const SDL_Event &event, bool valid) override
@@ -46,6 +68,6 @@ class MarginWrapper: public Widget
         void addChild(Widget *, Widget::VarDir, Widget::VarOff, Widget::VarOff, bool) override { throw fflreach(); }
 
     public:
-        const Widget *wrapped() const { return firstChild(); }
-        /* */ Widget *wrapped()       { return firstChild(); }
+        const Widget *wrapped() const { return lastChild(); }
+        /* */ Widget *wrapped()       { return lastChild(); }
 };
diff --git a/client/src/menuboard.cpp b/client/src/menuboard.cpp
@@ -80,6 +80,7 @@ MenuBoard::MenuBoard(
           false,
 
           argMargin,
+          nullptr,
 
           this,
           false,

diff --git a/client/src/shapeclipboard.hpp b/client/src/shapeclipboard.hpp
@@ -9,7 +9,8 @@ class ShapeClipBoard: public Widget
         std::function<void(const Widget *, int, int)> m_drawFunc;
 
     public:
-        ShapeClipBoard(Widget::VarDir,
+        ShapeClipBoard(
+                Widget::VarDir,
                 Widget::VarOff,
                 Widget::VarOff,
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,7 @@ MenuBoard::MenuBoard( @@
               false,
               argMargin,
+              nullptr,
               this,
               false,
@@ Expand Down @@