meta: Update from upstream.

skift-org · Feb 18, 2025 · feae874 · feae874
1 parent bdb4bfb
commit feae874
Show file tree

Hide file tree

Showing 250 changed files with 8,163 additions and 5,442 deletions.
diff --git a/src/apps/hideo-apps/app.cpp b/src/apps/hideo-apps/app.cpp
@@ -34,8 +34,12 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::BASKET,
         .title = "Apps"s,
-        .sidebar = slot$(sidebar()),
-        .body = slot$(pageContent() | Ui::grow()),
+        .sidebar = [] {
+            return sidebar();
+        },
+        .body = [] {
+            return pageContent() | Ui::grow();
+        },
     });
 }
 

diff --git a/src/apps/hideo-avplayer/app.cpp b/src/apps/hideo-avplayer/app.cpp
@@ -75,7 +75,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::PLAY_CIRCLE,
         .title = "Media Player"s,
-        .body = slot$(player()),
+        .body = [] {
+            return player();
+        },
     });
 }
 

diff --git a/src/apps/hideo-calculator/app.cpp b/src/apps/hideo-calculator/app.cpp
@@ -102,10 +102,12 @@ Ui::Child app() {
             .icon = Mdi::CALCULATOR,
             .title = "Calculator"s,
             .titlebar = Kr::TitlebarStyle::DIALOG,
-            .body = slot$(Ui::vflow(
-                screen(state) | Ui::dragRegion(),
-                keypad(state) | Ui::grow()
-            )),
+            .body = [&] {
+                return Ui::vflow(
+                    screen(state) | Ui::dragRegion(),
+                    keypad(state) | Ui::grow()
+                );
+            },
             .size = {300, 332},
         });
     });

diff --git a/src/apps/hideo-calendar/app.cpp b/src/apps/hideo-calendar/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::CALENDAR,
         .title = "Calendar"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-canvas/app.cpp b/src/apps/hideo-canvas/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::DRAW,
         .title = "Canvas"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-chat/app.cpp b/src/apps/hideo-chat/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::MESSAGE,
         .title = "Chat"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-code/app.cpp b/src/apps/hideo-code/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::CODE_BRACES,
         .title = "Code"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-demos/demo-text.h b/src/apps/hideo-demos/demo-text.h
@@ -16,41 +16,29 @@ static inline Demo TEXT_DEMO{
     "Typography",
     [] {
         return Ui::vflow(
-                   Kr::treeRow(
-                       slot$(Ui::icon(Mdi::TEXT)), "Display"s, NONE,
-                       slots$(
-                           Ui::displayLarge("Display Large"),
-                           Ui::displayMedium("Display Medium"),
-                           Ui::displaySmall("Display Small")
-                       )
-                   ),
-
-                   Kr::treeRow(
-                       slot$(Ui::icon(Mdi::TEXT)), "Headlines"s, NONE,
-                       slots$(
-                           Ui::headlineLarge("Headline Large"),
-                           Ui::headlineMedium("Headline Medium"),
-                           Ui::headlineSmall("Headline Small")
-                       )
-                   ),
-
-                   Kr::treeRow(
-                       slot$(Ui::icon(Mdi::TEXT)), "Titles"s, NONE,
-                       slots$(
-                           Ui::titleLarge("Title Large"),
-                           Ui::titleMedium("Title Medium"),
-                           Ui::titleSmall("Title Small")
-                       )
-                   ),
-
-                   Kr::treeRow(
-                       slot$(Ui::icon(Mdi::TEXT)), "Body"s, NONE,
-                       slots$(
-                           Ui::bodyLarge("Body Large"),
-                           Ui::bodyMedium("Body Medium"),
-                           Ui::bodySmall("Body Small")
-                       )
-                   )
+                   Ui::displayLarge("Display Large"),
+                   Ui::displayMedium("Display Medium"),
+                   Ui::displaySmall("Display Small"),
+
+                   Ui::headlineLarge("Headline Large"),
+                   Ui::headlineMedium("Headline Medium"),
+                   Ui::headlineSmall("Headline Small"),
+
+                   Ui::titleLarge("Title Large"),
+                   Ui::titleMedium("Title Medium"),
+                   Ui::titleSmall("Title Small"),
+
+                   Ui::labelLarge("Label Large"),
+                   Ui::labelMedium("Label Medium"),
+                   Ui::labelSmall("Label Small"),
+
+                   Ui::bodyLarge("Body Large"),
+                   Ui::bodyMedium("Body Medium"),
+                   Ui::bodySmall("Body Small"),
+
+                   Ui::codeLarge("Code Large"),
+                   Ui::codeMedium("Code Medium"),
+                   Ui::codeSmall("Code Small")
                ) |
                Ui::vscroll();
     },

diff --git a/src/apps/hideo-files/app.cpp b/src/apps/hideo-files/app.cpp
@@ -50,7 +50,7 @@ Ui::Child pageContent(State const& state) {
                        : alert(
                              state,
                              "Can't access this location"s,
-                             Io::toStr(dir.none()).unwrap()
+                             Io::toStr(dir.none())
                          );
 
     return listing | Ui::grow();
@@ -61,15 +61,29 @@ Ui::Child app() {
         return Kr::scaffold({
             .icon = Mdi::FOLDER,
             .title = "Files"s,
-            .startTools = slots$(
-                goBackTool(s),
-                goForwardTool(s),
-                goParentTool(s)
-            ),
-            .midleTools = slots$(breadcrumb(s) | Ui::grow()),
-            .endTools = slots$(moreTool(s)),
-            .sidebar = slot$(sidebar(s)),
-            .body = slot$(pageContent(s)),
+            .startTools = [&] -> Ui::Children {
+                return {
+                    goBackTool(s),
+                    goForwardTool(s),
+                    goParentTool(s),
+                };
+            },
+            .middleTools = [&] -> Ui::Children {
+                return {
+                    breadcrumb(s) | Ui::grow(),
+                };
+            },
+            .endTools = [&] -> Ui::Children {
+                return {
+                    moreTool(s),
+                };
+            },
+            .sidebar = [&] {
+                return sidebar(s);
+            },
+            .body = [&] {
+                return pageContent(s);
+            },
         });
     });
 }

diff --git a/src/apps/hideo-files/model.cpp b/src/apps/hideo-files/model.cpp
@@ -6,23 +6,25 @@
 namespace Hideo::Files {
 
 Ui::Task<Action> reduce(State& s, Action a) {
-    a.visit(Visitor{
+    return a.visit(Visitor{
         [&](GoRoot) {
-            reduce(s, GoTo{"file:/"_url}).unwrap();
+            return reduce(s, GoTo{"file:/"_url});
         },
         [&](GoBack) {
             if (s.canGoBack())
                 s.currentIndex--;
+            return NONE;
         },
         [&](GoForward) {
             if (s.canGoForward())
                 s.currentIndex++;
+            return NONE;
         },
         [&](GoParent p) {
             auto parent = s.currentUrl().parent(p.index);
-            reduce(s, GoTo{parent}).unwrap();
+            return reduce(s, GoTo{parent});
         },
-        [&](Navigate navigate) {
+        [&](Navigate navigate) -> Ui::Task<Action> {
             auto dest = s.currentUrl();
             dest.append(navigate.item);
 
@@ -33,27 +35,30 @@ Ui::Task<Action> reduce(State& s, Action a) {
                     .objects = {dest},
                 });
             } else {
-                reduce(s, GoTo{dest}).unwrap();
+                return reduce(s, GoTo{dest});
             }
+            return NONE;
         },
         [&](GoTo gotTo) {
             if (s.currentUrl() == gotTo.url)
-                return;
+                return NONE;
 
             s.history.trunc(s.currentIndex + 1);
             s.history.pushBack(gotTo.url);
             s.currentIndex++;
+            return NONE;
         },
         [&](Refresh) {
+            return NONE;
         },
         [&](AddBookmark) {
+            return NONE;
         },
         [&](ToggleHidden) {
             s.showHidden = not s.showHidden;
+            return NONE;
         },
     });
-
-    return NONE;
 }
 
 } // namespace Hideo::Files
diff --git a/src/apps/hideo-files/widgets.cpp b/src/apps/hideo-files/widgets.cpp
@@ -107,7 +107,7 @@ Ui::Child directorEntry(Sys::DirEntry const& entry, bool odd) {
                    : Mime::iconFor(Mime::sniffSuffix(Mime::suffixOf(entry.name)).unwrapOr("file"s)),
                entry.name
            ) |
-           Kr::contextMenu(slot$(directoryContextMenu()));
+           Kr::contextMenu(directoryContextMenu);
 }
 
 Ui::Child directoryListing(State const& s, Sys::Dir const& dir) {
@@ -301,7 +301,7 @@ Ui::Child openFileDialog() {
                      : alert(
                            d,
                            "Can't access this location"s,
-                           Io::toStr(maybeDir.none()).unwrap()
+                           Io::toStr(maybeDir.none())
                        )
                 ) | Ui::pinSize({400, 260}),
                 Ui::separator(),

diff --git a/src/apps/hideo-fonts/main.cpp b/src/apps/hideo-fonts/main.cpp
@@ -106,15 +106,15 @@ Ui::Child fontfaceTags(Text::FontAttrs const& attrs) {
     }
 
     if (attrs.style != Text::FontStyle::NORMAL) {
-        children.pushBack(fontfaceTag(Io::toStr(attrs.style).unwrap()));
+        children.pushBack(fontfaceTag(Io::toStr(attrs.style)));
     }
 
     if (attrs.stretch != Text::FontStretch::NORMAL) {
-        children.pushBack(fontfaceTag(Io::toStr(attrs.stretch).unwrap()));
+        children.pushBack(fontfaceTag(Io::toStr(attrs.stretch)));
     }
 
     if (attrs.weight != Text::FontWeight::REGULAR) {
-        children.pushBack(fontfaceTag(Io::toStr(attrs.weight).unwrap()));
+        children.pushBack(fontfaceTag(Io::toStr(attrs.weight)));
     }
 
     return Ui::hflow(4, children);
@@ -208,8 +208,16 @@ Ui::Child app(Text::FontBook book) {
         return Kr::scaffold({
             .icon = Mdi::FORMAT_FONT,
             .title = "Fonts"s,
-            .startTools = slots$(Ui::button(Model::bindIf<GoBack>(s.canGoBack()), Ui::ButtonStyle::subtle(), Mdi::ARROW_LEFT)),
-            .body = slot$(appContent(s)),
+            .startTools = [&] -> Ui::Children {
+                return {Ui::button(
+                    Model::bindIf<GoBack>(s.canGoBack()),
+                    Ui::ButtonStyle::subtle(),
+                    Mdi::ARROW_LEFT
+                )};
+            },
+            .body = [&] {
+                return appContent(s);
+            },
         });
     });
 }

diff --git a/src/apps/hideo-images/main.cpp b/src/apps/hideo-images/main.cpp
@@ -12,15 +12,15 @@ namespace Hideo::Images {
 Ui::Child app(State initial) {
     return Ui::reducer<Model>(
         initial,
-        [](auto const& state) {
+        [](auto const& s) {
             return Kr::scaffold({
                 .icon = Mdi::IMAGE,
                 .title = "Images"s,
-                .body = slot$(
-                    state.isEditor
-                        ? editor(state)
-                        : viewer(state)
-                ),
+                .body = [&] {
+                    return s.isEditor
+                               ? editor(s)
+                               : viewer(s);
+                },
             });
         }
     );

diff --git a/src/apps/hideo-map/app.cpp b/src/apps/hideo-map/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::MAP,
         .title = "Map"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-mines/game.cpp b/src/apps/hideo-mines/game.cpp
@@ -10,7 +10,9 @@ Ui::Child game() {
     return Kr::scaffold({
         .icon = Mdi::MINE,
         .title = "Mines"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-notes/app.cpp b/src/apps/hideo-notes/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::FORMAT_LIST_BULLETED,
         .title = "Notes"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-peoples/app.cpp b/src/apps/hideo-peoples/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::ACCOUNT,
         .title = "Peoples"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }
 

diff --git a/src/apps/hideo-recorder/app.cpp b/src/apps/hideo-recorder/app.cpp
@@ -10,7 +10,9 @@ Ui::Child app() {
     return Kr::scaffold({
         .icon = Mdi::MICROPHONE,
         .title = "Recorder"s,
-        .body = slot$(Ui::empty()),
+        .body = [] {
+            return Ui::empty();
+        },
     });
 }