vendors: Update from upstream.

odoo · Sep 16, 2024 · c92a766 · c92a766
1 parent 081a3e3
commit c92a766
Show file tree

Hide file tree

Showing 29 changed files with 437 additions and 471 deletions.
diff --git a/meta/plugins/requirements.txt b/meta/plugins/requirements.txt
@@ -1 +1 @@
-git+https://github.com/cute-engineering/[email protected].3
+git+https://github.com/cute-engineering/[email protected].5
diff --git a/src/compile_flags.txt b/src/compile_flags.txt
@@ -7,10 +7,9 @@
 -Werror
 
 -I./
--I./vendors/apps
+-I./vendors/assets
 -I./vendors/impls
 -I./vendors/libs
--I./vendors/specs
 -I./web
 -I../.cutekit/extern/cute-engineering
 -I../.cutekit/extern/cute-engineering

diff --git a/src/paper-muncher/inspector.cpp b/src/paper-muncher/inspector.cpp
@@ -1,14 +1,19 @@
-#include <hideo-base/scafold.h>
 #include <karm-kira/context-menu.h>
 #include <karm-kira/dialog.h>
 #include <karm-kira/error-page.h>
+#include <karm-kira/scaffold.h>
 #include <karm-kira/side-panel.h>
+#include <karm-kira/titlebar.h>
+#include <karm-kira/toolbar.h>
 #include <karm-mime/mime.h>
 #include <karm-sys/file.h>
 #include <karm-sys/launch.h>
+#include <karm-ui/app.h>
+#include <karm-ui/dialog.h>
 #include <karm-ui/drag.h>
 #include <karm-ui/input.h>
 #include <karm-ui/popover.h>
+#include <karm-ui/reducer.h>
 #include <karm-ui/scroll.h>
 #include <vaev-driver/fetcher.h>
 #include <vaev-view/inspect.h>
@@ -181,7 +186,7 @@ Ui::Child app(Mime::Url url, Res<Strong<Vaev::Markup::Document>> dom) {
         },
         [](State const &s) {
             return Ui::vflow(
-                       Hideo::toolbar(
+                       Kr::toolbar({
                            Ui::button(
                                [&](Ui::Node &n) {
                                    Ui::showDialog(n, Kr::alert("Paper-Muncher"s, "Copyright © 2024, Odoo S.A."s));
@@ -196,30 +201,11 @@ Ui::Child app(Mime::Url url, Res<Strong<Vaev::Markup::Document>> dom) {
                                },
                                Ui::ButtonStyle::subtle(), Mdi::DOTS_HORIZONTAL
                            ),
-                           Hideo::controls()
-                       ) | Ui::dragRegion(),
-                       appContent(s) | Ui::grow()
+                           Kr::titlebarControls(),
+                       }) | Ui::dragRegion(),
+                       appContent(s) | Ui::inspector | Ui::grow()
                    ) |
                    Ui::pinSize({800, 600}) | Ui::dialogLayer() | Ui::popoverLayer();
-
-            return Hideo::scafold({
-                .icon = Mdi::SURFING,
-                .title = "Vaev"s,
-                .startTools = slots$(
-                    Ui::button(Model::bind<Reload>(), Ui::ButtonStyle::subtle(), Mdi::REFRESH)
-                ),
-                .midleTools = slots$(addressBar(s.url) | Ui::grow()),
-                .endTools = slots$(
-                    Ui::button(
-                        [&](Ui::Node &n) {
-                            Ui::showPopover(n, n.bound().bottomEnd(), mainMenu(s));
-                        },
-                        Ui::ButtonStyle::subtle(),
-                        Mdi::DOTS_HORIZONTAL
-                    )
-                ),
-                .body = slot$(appContent(s)),
-            });
         }
     );
 }

diff --git a/src/paper-muncher/main.cpp b/src/paper-muncher/main.cpp
@@ -250,7 +250,7 @@ Async::Task<> entryPointAsync(Sys::Context &ctx) {
 
         co_return Ui::runApp(
             ctx,
-            PaperMuncher::Inspector::app(input, dom) | Ui::inspector
+            PaperMuncher::Inspector::app(input, dom) 
         );
     } else {
         Sys::errln("unknown verb: {} (expected: css-dump-stylesheet, css-dump-sst, css-dump-tokens, style-list-props, markup-dump-dom, markup-dump-tokens, inspector)\n");

diff --git a/src/paper-muncher/manifest.json b/src/paper-muncher/manifest.json
@@ -4,8 +4,8 @@
     "type": "exe",
     "requires": [
         "karm-sys",
+        "karm-kira",
         "vaev-driver",
-        "vaev-view",
-        "hideo-base"
+        "vaev-view"
     ]
 }
diff --git a/src/vendors/apps/hideo-base/manifest.json b/src/vendors/apps/hideo-base/manifest.json
diff --git a/src/vendors/apps/hideo-base/scafold.cpp b/src/vendors/apps/hideo-base/scafold.cpp