karm-scene: Moved page to karm-scene + Added viewbox and transform.

src/libs/karm-kira/number.cpp

@@ -0,0 +1,36 @@
+#include <karm-ui/focus.h>
+#include <karm-ui/layout.h>
+#include <mdi/minus.h>
+#include <mdi/plus.h>
+
+#include "number.h"
+
+namespace Karm::Kira {
+
+Ui::Child number(f64 value, Ui::OnChange<f64> onChange, f64 step) {
+    return Ui::hflow(
+               Ui::button(
+                   [onChange, value, step](auto &n) {
+                       onChange(n, value - step);
+                   },
+                   Ui::ButtonStyle::subtle(),
+                   Mdi::MINUS
+               ),
+               Ui::labelMedium("{}", value) | Ui::insets({0, 4}) | Ui::center(),
+               Ui::button(
+                   [onChange, value, step](auto &n) {
+                       onChange(n, value + step);
+                   },
+                   Ui::ButtonStyle::subtle(),
+                   Mdi::PLUS
+               )
+           ) |
+           Ui::box({
+               .borderRadii = 4,
+               .borderWidth = 1,
+               .borderFill = Ui::GRAY800,
+           }) |
+           Ui::focusable();
+}
+
+} // namespace Karm::Kira

src/libs/karm-kira/number.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <karm-ui/input.h>
+
+#include "_prelude.h"
+
+namespace Karm::Kira {
+
+Ui::Child number(f64 value, Ui::OnChange<f64> onChange, f64 step = 1);
+
+} // namespace Karm::Kira

src/libs/karm-kira/print-dialog.cpp

@@ -18,7 +18,7 @@ namespace Karm::Kira {
 struct State {
     PrintPreview preview;
     Print::Settings settings = {};
-    Vec<Strong<Scene::Page>> pages = preview(settings);
+    Vec<Print::Page> pages = preview(settings);
 };
 
 struct ChangePaper {
@@ -37,12 +37,17 @@ struct ToggleHeaderFooter {};
 
 struct ToggleBackgroundGraphics {};
 
+struct ChangeScale {
+    f64 scale;
+};
+
 using Action = Union<
     ChangePaper,
     ChangeOrientation,
     ChangeMargin,
     ToggleHeaderFooter,
-    ToggleBackgroundGraphics>;
+    ToggleBackgroundGraphics,
+    ChangeScale>;
 
 static void reduce(State &s, Action a) {
     bool shouldUpdatePreview = false;
@@ -62,6 +67,9 @@ static void reduce(State &s, Action a) {
     } else if (a.is<ToggleBackgroundGraphics>()) {
         s.settings.backgroundGraphics = not s.settings.backgroundGraphics;
         shouldUpdatePreview = true;
+    } else if (auto changeScale = a.is<ChangeScale>()) {
+        s.settings.scale = clamp(changeScale->scale, 0.1, 10.);
+        shouldUpdatePreview = true;
     }
 
     if (shouldUpdatePreview) {
@@ -111,7 +119,7 @@ Ui::Child _printPaper(State const &s, usize index) {
 
     return Ui::stack(
                Ui::canvas(
-                   s.pages[index],
+                   s.pages[index].content(),
                    {
                        .showBackgroundGraphics = s.settings.backgroundGraphics,
                    }
@@ -301,6 +309,15 @@ Ui::Child _printSettings(State const &s) {
                         "Margins"s
                     ),
 
+                    numberRow(
+                        s.settings.scale,
+                        [](auto &n, f64 scale) {
+                            Model::bubble<ChangeScale>(n, ChangeScale{scale});
+                        },
+                        0.1,
+                        "Scale"s
+                    ),
+
                     checkboxRow(
                         s.settings.headerFooter,
                         [&](auto &n, ...) {

src/libs/karm-kira/print-dialog.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <karm-scene/page.h>
+#include <karm-print/page.h>
 #include <karm-ui/input.h>
 
 #include "_prelude.h"
 
 namespace Karm::Kira {
 
-using PrintPreview = SharedFunc<Vec<Strong<Scene::Page>>(Print::Settings const &)>;
+using PrintPreview = SharedFunc<Vec<Print::Page>(Print::Settings const &)>;
 
 Ui::Child printDialog(PrintPreview preview);
 

src/libs/karm-kira/row.cpp

@@ -7,6 +7,7 @@
 
 #include "checkbox.h"
 #include "color-input.h"
+#include "number.h"
 #include "radio.h"
 #include "row.h"
 #include "select.h"
@@ -158,6 +159,15 @@ Ui::Child colorRow(Gfx::Color c, Ui::OnChange<Gfx::Color> onChange, String title
     );
 }
 
+Ui::Child numberRow(f64 value, Ui::OnChange<f64> onChange, f64 step, String title) {
+    return rowContent(
+        NONE,
+        title,
+        NONE,
+        number(value, std::move(onChange), step)
+    );
+}
+
 Ui::Child treeRow(Opt<Ui::Slot> leading, String title, Opt<String> subtitle, Ui::Slot child) {
     return Ui::state(false, [=, leading = std::move(leading), child = std::move(child)](bool state, auto bind) {
         return vflow(

src/libs/karm-kira/row.h

@@ -30,6 +30,8 @@ Ui::Child selectRow(Ui::Child value, Ui::Slots options, String title);
 
 Ui::Child colorRow(Gfx::Color color, Ui::OnChange<Gfx::Color> onChange, String title);
 
+Ui::Child numberRow(f64 value, Ui::OnChange<f64> onChange, f64 step, String title);
+
 Ui::Child treeRow(Opt<Ui::Slot> leading, String title, Opt<String> subtitle, Ui::Slot child);
 
 Ui::Child treeRow(Opt<Ui::Slot> leading, String title, Opt<String> subtitle, Ui::Slots children);

src/libs/karm-print/manifest.json

@@ -4,6 +4,7 @@
     "type": "lib",
     "description": "Print documents and images.",
     "requires": [
-        "karm-pdf"
+        "karm-pdf",
+        "karm-scene"
     ]
 }

src/libs/karm-print/page.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <karm-scene/base.h>
+#include <karm-scene/stack.h>
+#include <karm-scene/viewbox.h>
+
+#include "paper.h"
+#include "printer.h"
+
+namespace Karm::Print {
+
+struct Page {
+    PaperStock _paper;
+    Strong<Scene::Node> _content;
+
+    Page(PaperStock paper, Opt<Strong<Scene::Node>> content = NONE)
+        : _paper(paper), _content(content ? content.take() : makeStrong<Scene::Stack>()) {}
+
+    Strong<Scene::Node> content() const {
+        return makeStrong<Scene::Viewbox>(_paper.size(), _content);
+    }
+
+    void print(Print::Printer &doc, Scene::PaintOptions o = {.showBackgroundGraphics = false}) {
+        auto &canvas = doc.beginPage(_paper);
+        content()->paint(canvas, _paper.size().cast<f64>(), o);
+    }
+
+    void repr(Io::Emit &e) const {
+        e("(page paper:{} root:{})", _paper, content());
+    }
+};
+
+} // namespace Karm::Print

src/libs/karm-print/paper.h

@@ -27,6 +27,10 @@ struct PaperStock {
     PaperStock landscape() const {
         return {name, height, width};
     }
+
+    void repr(Io::Emit &e) const {
+        e("(paper {} {}x{})", name, width, height);
+    }
 };
 
 struct PaperSeries {
@@ -162,7 +166,7 @@ struct Settings {
     Margins margins = Margins::DEFAULT;
     Orientation orientation = Orientation::PORTRAIT;
 
-    double scale = 1.;
+    f64 scale = 1.;
     bool headerFooter = true;
     bool backgroundGraphics = false;
 };

src/libs/karm-scene/base.h

@@ -2,7 +2,6 @@
 
 #include <karm-gfx/canvas.h>
 #include <karm-io/emit.h>
-#include <karm-print/printer.h>
 
 namespace Karm::Scene {
 
@@ -23,8 +22,6 @@ struct Node {
 
     virtual void paint(Gfx::Canvas &, Math::Rectf = Math::Rectf::MAX, PaintOptions = {}) {}
 
-    virtual void print(Print::Printer &, PaintOptions = {.showBackgroundGraphics = false}) {}
-
     virtual void repr(Io::Emit &e) const {
         e("(node z:{})", zIndex);
     }

src/libs/karm-scene/manifest.json

@@ -4,7 +4,6 @@
     "type": "lib",
     "description": "2D scene graph library",
     "requires": [
-        "karm-gfx",
-        "karm-print"
+        "karm-gfx"
     ]
 }

src/libs/karm-scene/stack.h

@@ -6,9 +6,6 @@ namespace Karm::Scene {
 
 struct Stack : public Node {
     Vec<Strong<Node>> _children;
-    Opt<Math::Trans2f> _transform;
-
-    Stack(Opt<Math::Trans2f> transform = NONE) : _transform(transform) {}
 
     void add(Strong<Node> child) {
         _children.pushBack(child);
@@ -27,28 +24,16 @@ struct Stack : public Node {
         Math::Rectf rect;
         for (auto &child : _children)
             rect = rect.mergeWith(child->bound());
+
         return rect;
     }
 
     void paint(Gfx::Canvas &g, Math::Rectf r, PaintOptions o) override {
         if (not bound().colide(r))
             return;
 
-        if (_transform) {
-            g.push();
-            g.transform(_transform.unwrap());
-        }
-
         for (auto &child : _children)
             child->paint(g, r, o);
-
-        if (_transform)
-            g.pop();
-    }
-
-    void print(Print::Printer &p, PaintOptions o) override {
-        for (auto &child : _children)
-            child->print(p, o);
     }
 
     void repr(Io::Emit &e) const override {

src/libs/karm-scene/transform.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include "base.h"
+
+namespace Karm::Scene {
+
+struct Transform : public Node {
+    Strong<Node> _content;
+    Math::Trans2f _transform;
+
+    Transform(Strong<Node> content, Math::Trans2f transform)
+        : _content(content), _transform(transform) {}
+
+    void prepare() override {
+        _content->prepare();
+    }
+
+    Math::Rectf bound() override {
+        return _transform
+            .inverse()
+            .apply(_content->bound())
+            .bound();
+    }
+
+    void paint(Gfx::Canvas &g, Math::Rectf r, PaintOptions o) override {
+        if (not bound().colide(r))
+            return;
+
+        g.push();
+        g.transform(_transform);
+        _content->paint(g, r, o);
+        g.pop();
+    }
+
+    void repr(Io::Emit &e) const override {
+        e("(transform transform:{} content:{})", _transform, _content);
+    }
+};
+
+} // namespace Karm::Scene