vaev-layout: Holiday cleanup, and some light refactoring.

odoo · Jan 6, 2025 · cac036f · cac036f
1 parent 04ad56c
commit cac036f
Show file tree

Hide file tree

Showing 27 changed files with 467 additions and 547 deletions.
diff --git a/samples/general-ledger.xhtml b/samples/general-ledger.xhtml
@@ -68,7 +68,7 @@
             </div>
         </header>
 
-        <div class="d-flex align-items-start">
+        <div class="align-items-start">
             <table class="o_table  ">
 
                 <thead id="table_header">

diff --git a/src/web/vaev-driver/print.cpp b/src/web/vaev-driver/print.cpp
@@ -4,7 +4,6 @@
 #include <vaev-layout/builder.h>
 #include <vaev-layout/layout.h>
 #include <vaev-layout/paint.h>
-#include <vaev-layout/tree.h>
 #include <vaev-layout/values.h>
 #include <vaev-style/page.h>
 
@@ -327,7 +326,7 @@ Vec<Print::Page> print(Markup::Document const &dom, Print::Settings const &setti
         };
 
         contentTree.viewport = vp;
-        contentTree.fc.currSize = pageContent.size();
+        contentTree.fc = {pageContent.size()};
 
         if (settings.headerFooter and settings.margins != Print::Margins::NONE)
             _paintMargins(*pageStyle, pageRect, pageContent, *pageStack);

diff --git a/src/web/vaev-driver/render.h b/src/web/vaev-driver/render.h
@@ -2,9 +2,7 @@
 
 #include <karm-scene/base.h>
 #include <vaev-base/length.h>
-#include <vaev-layout/box.h>
-#include <vaev-layout/frag.h>
-#include <vaev-layout/tree.h>
+#include <vaev-layout/base.h>
 #include <vaev-markup/dom.h>
 #include <vaev-style/media.h>
 

diff --git a/src/web/vaev-layout/box.cpp → src/web/vaev-layout/base.cpp b/src/web/vaev-layout/box.cpp → src/web/vaev-layout/base.cpp
@@ -1,8 +1,7 @@
 #include <karm-base/clamp.h>
 #include <karm-text/loader.h>
 
-#include "box.h"
-#include "frag.h"
+#include "base.h"
 
 namespace Vaev::Layout {