add support for nested 'box' elements (6c49fc0e) · Commits · github_fork / Clip

examples/demo.ptx

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		width: 1920px;
		height: 1080px;

		background-color: #000;
		margin: 4em;

		box {
		margin: 8em;
		background-color: #0f0;

		box {
		background-color: #00f;
		}
		}

source/core/environment.cc

+0 −20

Original line number	Diff line number	Diff line
		@@ -68,26 +68,6 @@ ReturnCode environment_configure(
		static const ParserDefinitions pdefs = {
		{"width", bind(&configure_measure, _1, &env->screen_width)},
		{"height", bind(&configure_measure, _1, &env->screen_height)},
		{"background-color", bind(&configure_color, _1, &env->background_color)},
		{
		"foreground-color",
		configure_multiprop({
		bind(&configure_color, _1, &env->text_color),
		bind(&configure_color, _1, &env->border_color),
		})
		},
		{"text-color", bind(&configure_color, _1, &env->text_color)},
		{"border-color", bind(&configure_color, _1, &env->border_color)},
		{"scale-x", bind(&domain_configure, _1, &env->scale_x)},
		{"scale-x-min", bind(&configure_float_opt, _1, &env->scale_x.min)},
		{"scale-x-max", bind(&configure_float_opt, _1, &env->scale_x.max)},
		{"scale-x-padding", bind(&configure_float, _1, &env->scale_x.padding)},
		{"scale-x-layout", bind(&configure_scale_layout, _1, &env->scale_layout_x)},
		{"scale-y", bind(&domain_configure, _1, &env->scale_y)},
		{"scale-y-min", bind(&configure_float_opt, _1, &env->scale_y.min)},
		{"scale-y-max", bind(&configure_float_opt, _1, &env->scale_y.max)},
		{"scale-y-padding", bind(&configure_float, _1, &env->scale_y.padding)},
		{"scale-y-layout", bind(&configure_scale_layout, _1, &env->scale_layout_y)},
		};

		return parseAll(plist, pdefs);

source/element.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -66,10 +66,16 @@ template <typename T>
		using ElementLayoutAsFn = std::function<ReturnCode (const T&, const Layer&, LayoutInfo*)>;

		struct Element {
		virtual ~Element() = default;
		ElementLayoutFn layout;
		ElementDrawFn draw;
		};

		template <typename T>
		struct ElementInstance : public Element {
		T config;
		};

		using ElementRef = std::shared_ptr<Element>;

		} // namespace plotfx

source/element_factory_impl.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -42,15 +42,14 @@ ElementBuilder elem_builder(
		const plist::PropertyList& prop,
		const Environment& env,
		ElementRef* elem) -> ReturnCode {
		auto e = std::make_unique<ElementInstance<T>>();

		T config;
		if (auto rc = config_fn(prop, env, &config); !rc) {
		if (auto rc = config_fn(prop, env, &e->config); !rc) {
		return rc;
		}

		auto e = std::make_unique<Element>();
		e->layout = bind(layout_fn, config, _1, _2);
		e->draw = bind(draw_fn, config, _1, _2);
		e->layout = bind(layout_fn, e->config, _1, _2);
		e->draw = bind(draw_fn, e->config, _1, _2);
		*elem = std::move(e);
		return OK;
		};

source/elements/box.cc

+65 −3

Original line number	Diff line number	Diff line
		@@ -43,6 +43,22 @@ ReturnCode draw(
		const BoxConfig& config,
		const LayoutInfo& parent_layout,
		Layer* layer) {

		/* draw background */
		{
		const auto& bg_box = parent_layout.content_box;
		FillStyle bg_fill;
		bg_fill.color = config.background_color;

		fillRectangle(
		layer,
		Point(bg_box.x, bg_box.y),
		bg_box.w,
		bg_box.h,
		bg_fill);
		}

		/* calculate margin box */
		auto margins = config.margins;
		for (auto& m : margins) {
		convert_unit_typographic(layer->dpi, config.font_size, &m);
		@@ -56,6 +72,8 @@ ReturnCode draw(
		margins[3]);

		auto content_box = bounding_box;

		/* layout and draw children */
		std::vector<Rectangle> element_boxes;
		for (const auto& e : config.children) {
		LayoutInfo layout;
		@@ -99,9 +117,18 @@ ReturnCode configure(
		const plist::PropertyList& plist,
		const Environment& env,
		BoxConfig* config) {
		config->font = env.font;
		config->font_size = env.font_size;

		static const ParserDefinitions pdefs = {
		config->color_scheme = env.color_scheme;
		config->text_color = env.text_color;
		config->border_color = env.border_color;
		config->background_color = env.background_color;
		config->scale_x = env.scale_x;
		config->scale_y = env.scale_y;
		config->scale_layout_x = env.scale_layout_x;
		config->scale_layout_y = env.scale_layout_y;

		ParserDefinitions pdefs = {
		{
		"margin",
		configure_multiprop({
		@@ -115,12 +142,47 @@ ReturnCode configure(
		{"margin-right", bind(&configure_measure, _1, &config->margins[1])},
		{"margin-bottom", bind(&configure_measure, _1, &config->margins[2])},
		{"margin-left", bind(&configure_measure, _1, &config->margins[3])},
		{"scale-x", bind(&domain_configure, _1, &config->scale_x)},
		{"scale-x-min", bind(&configure_float_opt, _1, &config->scale_x.min)},
		{"scale-x-max", bind(&configure_float_opt, _1, &config->scale_x.max)},
		{"scale-x-padding", bind(&configure_float, _1, &config->scale_x.padding)},
		{"scale-x-layout", bind(&configure_scale_layout, _1, &config->scale_layout_x)},
		{"scale-y", bind(&domain_configure, _1, &config->scale_y)},
		{"scale-y-min", bind(&configure_float_opt, _1, &config->scale_y.min)},
		{"scale-y-max", bind(&configure_float_opt, _1, &config->scale_y.max)},
		{"scale-y-padding", bind(&configure_float, _1, &config->scale_y.padding)},
		{"scale-y-layout", bind(&configure_scale_layout, _1, &config->scale_layout_y)},
		{"background-color", bind(&configure_color, _1, &config->background_color)},
		{
		"foreground-color",
		configure_multiprop({
		bind(&configure_color, _1, &config->text_color),
		bind(&configure_color, _1, &config->border_color),
		})
		},
		{"text-color", bind(&configure_color, _1, &config->text_color)},
		{"border-color", bind(&configure_color, _1, &config->border_color)},
		};

		if (auto rc = parseAll(plist, pdefs); !rc) {
		return rc;
		}

		Environment child_env;
		child_env.screen_width = env.screen_width;
		child_env.screen_height = env.screen_height;
		child_env.dpi = env.dpi;
		child_env.font = config->font;
		child_env.font_size = config->font_size;
		child_env.color_scheme = config->color_scheme;
		child_env.text_color = config->text_color;
		child_env.border_color = config->border_color;
		child_env.background_color = config->background_color;
		child_env.scale_x = config->scale_x;
		child_env.scale_y = config->scale_y;
		child_env.scale_layout_x = config->scale_layout_x;
		child_env.scale_layout_y = config->scale_layout_y;

		for (size_t i = 0; i < plist.size(); ++i) {
		if (!plist::is_map(plist[i])) {
		continue;
		@@ -133,7 +195,7 @@ ReturnCode configure(
		auto rc = buildElement(
		elem_name,
		*elem_config,
		env,
		child_env,
		&elem);

		if (!rc) {

Admin message