vaev-markup: Consolidated the html, xml, svg, and, mathml code into a…

… single component.
odoo · Sep 2, 2024 · 715c340 · 715c340
1 parent d73d608
commit 715c340
Show file tree

Hide file tree

Showing 82 changed files with 2,445 additions and 2,825 deletions.
diff --git a/src/web/vaev-base/font.h b/src/web/vaev-base/font.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include <karm-mime/url.h>
-#include <vaev-base/angle.h>
-#include <vaev-base/length.h>
-#include <vaev-base/percent.h>
+
+#include "angle.h"
+#include "length.h"
+#include "percent.h"
 
 namespace Vaev {
 

diff --git a/src/web/vaev-devtools/app.cpp b/src/web/vaev-devtools/app.cpp
@@ -23,7 +23,7 @@ enum struct SidePanel {
 
 struct State {
     Mime::Url url;
-    Res<Strong<Vaev::Dom::Document>> dom;
+    Res<Strong<Vaev::Markup::Document>> dom;
     SidePanel sidePanel = SidePanel::CLOSE;
 
     bool canGoBack() const {
@@ -88,7 +88,8 @@ Ui::Child addressBar(Mime::Url const &url) {
                0,
                Math::Align::CENTER,
                Ui::text("{}", url),
-               Ui::grow(NONE)
+               Ui::grow(NONE),
+               Kr::contextMenuIcon(Model::bind<Reload>(), Mdi::REFRESH)
            ) |
            Ui::box({
                .padding = {12, 0, 0, 0},
@@ -170,7 +171,7 @@ Ui::Child appContent(State const &s) {
     );
 }
 
-Ui::Child app(Mime::Url url, Res<Strong<Vaev::Dom::Document>> dom) {
+Ui::Child app(Mime::Url url, Res<Strong<Vaev::Markup::Document>> dom) {
     return Ui::reducer<Model>(
         {
             url,
@@ -186,10 +187,13 @@ Ui::Child app(Mime::Url url, Res<Strong<Vaev::Dom::Document>> dom) {
                                Ui::ButtonStyle::subtle(),
                                Mdi::SURFING
                            ),
-                           addressBar(s.url) | Ui::grow(), Ui::button(Model::bind<Reload>(), Ui::ButtonStyle::subtle(), Mdi::REFRESH), Ui::button([&](Ui::Node &n) {
-                               Ui::showPopover(n, n.bound().bottomEnd(), mainMenu(s));
-                           },
-                                                                                                                                                  Ui::ButtonStyle::subtle(), Mdi::DOTS_HORIZONTAL),
+                           addressBar(s.url) | Ui::grow(),
+                           Ui::button(
+                               [&](Ui::Node &n) {
+                                   Ui::showPopover(n, n.bound().bottomEnd(), mainMenu(s));
+                               },
+                               Ui::ButtonStyle::subtle(), Mdi::DOTS_HORIZONTAL
+                           ),
                            Hideo::controls()
                        ) | Ui::dragRegion(),
                        appContent(s) | Ui::grow()

diff --git a/src/web/vaev-devtools/app.h b/src/web/vaev-devtools/app.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <karm-ui/node.h>
-#include <vaev-dom/document.h>
+#include <vaev-markup/dom.h>
 
 namespace Hideo::Browser {
 
-Ui::Child app(Mime::Url url, Res<Strong<Vaev::Dom::Document>> dom);
+Ui::Child app(Mime::Url url, Res<Strong<Vaev::Markup::Document>> dom);
 
 } // namespace Hideo::Browser
diff --git a/src/web/vaev-devtools/manifest.json b/src/web/vaev-devtools/manifest.json
@@ -5,8 +5,6 @@
     "type": "exe",
     "requires": [
         "hideo-base",
-        "vaev-html",
-        "vaev-xml",
         "vaev-view"
     ],
     "provides": [

diff --git a/src/web/vaev-dom/_mod.h b/src/web/vaev-dom/_mod.h
diff --git a/src/web/vaev-dom/attr.h b/src/web/vaev-dom/attr.h
diff --git a/src/web/vaev-dom/character-data.h b/src/web/vaev-dom/character-data.h
diff --git a/src/web/vaev-dom/comment.h b/src/web/vaev-dom/comment.h
diff --git a/src/web/vaev-dom/document-type.h b/src/web/vaev-dom/document-type.h
diff --git a/src/web/vaev-dom/document.h b/src/web/vaev-dom/document.h
diff --git a/src/web/vaev-dom/element.h b/src/web/vaev-dom/element.h
diff --git a/src/web/vaev-dom/manifest.json b/src/web/vaev-dom/manifest.json