Skip to content

vaev-style: Make it a module! #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,21 @@
#include <karm-gc/heap.h>
#include <karm-gfx/cpu/canvas.h>
#include <karm-image/saver.h>
#include <karm-mime/mime.h>
#include <karm-print/file-printer.h>
#include <karm-print/page.h>
#include <karm-sys/entry.h>
#include <karm-sys/file.h>
#include <karm-sys/proc.h>
#include <vaev-style/computer.h>
#include <vaev-base/length.h>
#include <vaev-base/media.h>
#include <vaev-base/numbers.h>
#include <vaev-base/resolution.h>

import Vaev.Driver;
import Vaev.Layout;
import Karm.Http;
import Vaev.Style;

namespace PaperMuncher {

Expand Down
3 changes: 2 additions & 1 deletion src/web/vaev-browser/inspect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ module;
#include <vaev-dom/document-type.h>
#include <vaev-dom/document.h>
#include <vaev-dom/element.h>
#include <vaev-style/props.h>

export module Vaev.Browser:inspect;

import Vaev.Style;

namespace Vaev::Browser {

export struct ExpandNode {
Expand Down
4 changes: 3 additions & 1 deletion src/web/vaev-driver/loader.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
module;

#include <karm-gc/heap.h>
#include <karm-logger/logger.h>
#include <karm-mime/mime.h>
#include <karm-mime/url.h>
#include <karm-sys/dir.h>
#include <karm-sys/file.h>
#include <vaev-dom/document.h>
#include <vaev-dom/html/parser.h>
#include <vaev-dom/xml/parser.h>
#include <vaev-style/stylesheet.h>

export module Vaev.Driver:loader;

import Karm.Http;
import Karm.Aio;

import Vaev.Style;

namespace Vaev::Driver {

Async::Task<Gc::Ref<Dom::Document>> _loadDocumentAsync(Gc::Heap& heap, Mime::Url url, Rc<Http::Response> resp) {
Expand Down
5 changes: 4 additions & 1 deletion src/web/vaev-driver/print.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
module;

#include <karm-base/rc.h>
#include <karm-logger/logger.h>
#include <karm-math/au.h>
#include <karm-print/page.h>
#include <karm-scene/transform.h>
#include <karm-sys/time.h>
#include <karm-text/book.h>
#include <vaev-base/media.h>
#include <vaev-base/resolution.h>
#include <vaev-dom/document.h>
#include <vaev-style/computer.h>

export module Vaev.Driver:print;

import Vaev.Style;
import Vaev.Layout;
import :loader;

Expand Down
8 changes: 6 additions & 2 deletions src/web/vaev-driver/render.cpp
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
module;

#include <karm-base/box.h>
#include <karm-gc/ptr.h>
#include <karm-logger/logger.h>
#include <karm-math/au.h>
#include <karm-scene/stack.h>
#include <karm-sys/time.h>
#include <karm-text/book.h>
#include <vaev-style/computer.h>
#include <vaev-dom/document.h>

export module Vaev.Driver:render;

import :loader;
import Vaev.Style;
import Vaev.Layout;
import :loader;

namespace Vaev::Driver {

Expand Down
4 changes: 3 additions & 1 deletion src/web/vaev-layout/base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module;

#include <karm-image/picture.h>
#include <karm-text/prose.h>
#include <vaev-style/computer.h>
#include <vaev-base/resolution.h>

export module Vaev.Layout:base;

import Vaev.Style;

namespace Vaev::Layout {

// MARK: Fragmentainer ---------------------------------------------------------
Expand Down
8 changes: 7 additions & 1 deletion src/web/vaev-layout/builder.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
module;

#include <karm-image/loader.h>
#include <karm-text/book.h>
#include <karm-text/loader.h>
#include <karm-text/prose.h>
#include <vaev-base/display.h>
#include <vaev-base/table.h>
#include <vaev-base/text.h>
#include <vaev-dom/document.h>
#include <vaev-style/computer.h>
#include <vaev-dom/tags.h>
#include <vaev-dom/text.h>

export module Vaev.Layout:builder;

import Vaev.Style;
import :values;

namespace Vaev::Layout {
Expand Down
7 changes: 6 additions & 1 deletion src/web/vaev-layout/paint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ module;
#include <karm-scene/image.h>
#include <karm-scene/stack.h>
#include <karm-scene/text.h>
#include <vaev-style/computer.h>
#include <vaev-base/color.h>
#include <vaev-base/display.h>
#include <vaev-base/float.h>
#include <vaev-base/insets.h>
#include <vaev-base/visibility.h>

export module Vaev.Layout:paint;

import Vaev.Style;
import :base;
import :values;

Expand Down
16 changes: 16 additions & 0 deletions src/web/vaev-style/base.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module;

#include <karm-base/cursor.h>

export module Vaev.Style:base;

import Vaev.Style.Css;

namespace Vaev::Style {

export void eatWhitespace(Cursor<Css::Sst>& c) {
while (not c.ended() and c.peek() == Css::Token::WHITESPACE)
c.next();
}

} // namespace Vaev::Style
12 changes: 0 additions & 12 deletions src/web/vaev-style/base.h

This file was deleted.

24 changes: 24 additions & 0 deletions src/web/vaev-style/computed-impl.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module;

#include <karm-meta/id.h>

module Vaev.Style:computed_impl;

import :computed;
import :props;

namespace Vaev::Style {

Computed const& Computed::initial() {
static Computed computed = [] {
Computed res{};
StyleProp::any([&]<typename T>() {
if constexpr (requires { T::initial(); })
T{}.apply(res);
});
return res;
}();
return computed;
}

} // namespace Vaev::Style
Loading
Loading