karm-kira: Fix panel resizing.

Author: sleepy-monax

src/apps/hideo-zoo/pages.cpp

@@ -438,9 +438,9 @@ Page PAGE_RESIZABLE{
     "A control that allows the user to resize an element.",
     [] {
         return Ui::hflow(
-            Ui::labelMedium("One") | Ui::center() | Kr::resizable(Kr::ResizeHandle::END, 200, Ui::SINK<Math::Vec2i>),
+            Ui::labelMedium("One") | Ui::center() | Kr::resizable(Kr::ResizeHandle::END, 200, NONE),
             Ui::vflow(
-                Ui::labelMedium("Two") | Ui::center() | Kr::resizable(Kr::ResizeHandle::BOTTOM, 200, Ui::SINK<Math::Vec2i>),
+                Ui::labelMedium("Two") | Ui::center() | Kr::resizable(Kr::ResizeHandle::BOTTOM, 200, NONE),
                 Ui::labelMedium("Three") | Ui::center() | Ui::grow()
             ) | Ui::grow()
         );

src/libs/karm-kira/resizable.cpp

@@ -18,9 +18,9 @@ export enum struct ResizeHandle {
 
 struct Resizable : Ui::ProxyNode<Resizable> {
     Math::Vec2i _size;
-    Ui::Send<Math::Vec2i> _onChange;
+    Opt<Ui::Send<Math::Vec2i>> _onChange;
 
-    Resizable(Ui::Child child, Math::Vec2i size, Ui::Send<Math::Vec2i> onChange)
+    Resizable(Ui::Child child, Math::Vec2i size, Opt<Ui::Send<Math::Vec2i>> onChange)
         : ProxyNode<Resizable>(child),
           _size(size),
           _onChange(std::move(onChange)) {}
@@ -37,7 +37,11 @@ struct Resizable : Ui::ProxyNode<Resizable> {
                 _size = _size + de->delta;
                 auto minSize = child().size({}, Ui::Hint::MIN);
                 _size = _size.max(minSize);
-                _onChange(*this, _size);
+                if (_onChange) {
+                    _onChange(*this, _size);
+                } else {
+                    Ui::shouldLayout(*this);
+                }
                 e.accept();
             }
         }
@@ -52,11 +56,11 @@ struct Resizable : Ui::ProxyNode<Resizable> {
     }
 };
 
-export Ui::Child resizable(Ui::Child child, Math::Vec2i size, Ui::Send<Math::Vec2i> onChange) {
+export Ui::Child resizable(Ui::Child child, Math::Vec2i size, Opt<Ui::Send<Math::Vec2i>> onChange) {
     return makeRc<Resizable>(child, size, std::move(onChange));
 }
 
-export auto resizable(Math::Vec2i size, Ui::Send<Math::Vec2i> onChange) {
+export auto resizable(Math::Vec2i size, Opt<Ui::Send<Math::Vec2i>> onChange) {
     return [size, onChange = std::move(onChange)](Ui::Child child) mutable -> Ui::Child {
         return resizable(child, size, std::move(onChange));
     };
@@ -70,7 +74,7 @@ static Ui::Child _resizeHandle(Math::Vec2i dir) {
            Ui::dragRegion(dir);
 }
 
-export Ui::Child resizable(Ui::Child child, ResizeHandle handlePosition, Math::Vec2i size, Ui::Send<Math::Vec2i> onChange) {
+export Ui::Child resizable(Ui::Child child, ResizeHandle handlePosition, Math::Vec2i size, Opt<Ui::Send<Math::Vec2i>> onChange) {
     if (handlePosition == ResizeHandle::TOP) {
         return Ui::stack(
                    child,
@@ -110,9 +114,9 @@ export Ui::Child resizable(Ui::Child child, ResizeHandle handlePosition, Math::V
     }
 }
 
-export auto resizable(ResizeHandle handlePosition, Math::Vec2i size, Ui::Send<Math::Vec2i> onChange) {
-    return [handlePosition, size, onChange = std::move(onChange)](Ui::Child child) mutable -> Ui::Child {
-        return resizable(child, handlePosition, size, std::move(onChange));
+export auto resizable(ResizeHandle handlePosition, Math::Vec2i size, Opt<Ui::Send<Math::Vec2i>> onChange) {
+    return [handlePosition, size, onChange](Ui::Child child) mutable -> Ui::Child {
+        return resizable(child, handlePosition, size, onChange);
     };
 }
 

src/web/vaev-browser/app.cpp

@@ -370,7 +370,7 @@ Ui::Child appContent(State const& s) {
     }
     return Ui::hflow(
         webview(s) | Ui::grow(),
-        sidePanel(s) | Kr::resizable(Kr::ResizeHandle::START, {320}, Ui::SINK<Math::Vec2i>)
+        sidePanel(s) | Kr::resizable(Kr::ResizeHandle::START, {320}, NONE)
     );
 }
 

src/web/vaev-browser/inspect.cpp

@@ -179,7 +179,7 @@ Ui::Child computedStyles() {
 export Ui::Child inspect(Gc::Ref<Vaev::Dom::Document> n, InspectState const& s, Ui::Action<InspectorAction> a) {
     return Ui::vflow(
         node(n, s, a) | Ui::vscroll() | Ui::grow(),
-        computedStyles() | Kr::resizable(Kr::ResizeHandle::TOP, {128}, Ui::SINK<Math::Vec2i>)
+        computedStyles() | Kr::resizable(Kr::ResizeHandle::TOP, {128}, NONE)
     );
 }