vaev: Update from upstream.

skift-org · Dec 23, 2024 · d07fd0b · d07fd0b
1 parent 99f98f5
commit d07fd0b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/libs/karm-print/image-printer.h b/src/libs/karm-print/image-printer.h
@@ -11,18 +11,21 @@ struct ImagePrinter : public FilePrinter {
 
     Vec<Strong<Gfx::Surface>> _pages;
     Opt<Gfx::CpuCanvas> _canvas;
+    f64 _density;
     Image::Saver _saver;
 
-    ImagePrinter(Image::Saver saver = {})
-        : _saver(saver) {}
+    ImagePrinter(f64 density = 1, Image::Saver saver = {})
+        : _density(density),
+          _saver(saver) {}
 
     Gfx::Canvas &beginPage(PaperStock paper) override {
-        _pages.emplaceBack(Gfx::Surface::alloc(paper.size().cast<isize>(), Gfx::RGBA8888));
+        _pages.emplaceBack(Gfx::Surface::alloc(paper.size().cast<isize>() * _density, Gfx::RGBA8888));
 
         if (_canvas)
             _canvas->end();
         _canvas = Gfx::CpuCanvas{};
         _canvas->begin(*last(_pages));
+        _canvas->scale(_density);
         _canvas->clear(Gfx::WHITE);
 
         return *_canvas;

diff --git a/src/libs/karm-scene/transform.h b/src/libs/karm-scene/transform.h
@@ -17,7 +17,6 @@ struct Transform : public Node {
 
     Math::Rectf bound() override {
         return _transform
-            .inverse()
             .apply(_content->bound())
             .bound();
     }
@@ -28,6 +27,7 @@ struct Transform : public Node {
 
         g.push();
         g.transform(_transform);
+        r = _transform.inverse().apply(r).bound();
         _content->paint(g, r, o);
         g.pop();
     }

diff --git a/src/web/vaev-driver/manifest.json b/src/web/vaev-driver/manifest.json
@@ -6,6 +6,7 @@
     "requires": [
         "vaev-layout",
         "vaev-markup",
+        "karm-print",
         "karm-mime",
         "karm-sys"
     ]

diff --git a/src/web/vaev-layout/flex.cpp b/src/web/vaev-layout/flex.cpp
@@ -585,6 +585,7 @@ struct FlexLine {
         }
     }
 
+    // https://www.w3.org/TR/css-flexbox-1/#justify-content-property
     void justifyContent(Style::Align::Keywords justifyContent, Px mainSize, Px occupiedSize) {
         switch (justifyContent) {
         case Style::Align::SPACE_AROUND:
@@ -603,7 +604,10 @@ struct FlexLine {
             break;
 
         case Style::Align::SPACE_BETWEEN:
-            alignMainSpaceBetween(mainSize, occupiedSize);
+            if (occupiedSize > mainSize or items.len() == 1)
+                alignMainFlexStart();
+            else
+                alignMainSpaceBetween(mainSize, occupiedSize);
             break;
 
         case Style::Align::FLEX_START: