use the new unit system for font sizes (dcafb514) · Commits · github_fork / Clip

src/draw/text.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ ReturnCode text_draw(
		{"color", std::bind(&color_read, ctx, _1, &style.color)},
		{"text", std::bind(&expr_to_string, _1, &text)},
		{"font", expr_call_string_fn(std::bind(&font_load_best, _1, &style.font))},
		{"font-size", std::bind(&measure_read, _1, &style.font_size)},
		{"font-size", std::bind(&expr_to_font_size, _1, *layer, &style.font_size)},
		});

		if (!config_rc) {

src/figure/legend.cc

+8 −8

Original line number	Diff line number	Diff line
		@@ -54,16 +54,16 @@ LegendConfig::LegendConfig() :
		void legend_normalize(
		Context* ctx,
		LegendConfig* config) {
		for (auto& m : config->margins) {
		convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &m);
		}
		//for (auto& m : config->margins) {
		// convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &m);
		//}

		for (auto& m : config->padding) {
		convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &m);
		}
		//for (auto& m : config->padding) {
		// convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &m);
		//}

		convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &config->item_row_padding);
		convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &config->item_column_padding);
		//convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &config->item_row_padding);
		//convert_unit_typographic(layer_get_dpi(ctx), layer_get_rem(ctx), &config->item_column_padding);
		}

		ReturnCode legend_layout_item_rows(

src/figure/legend_item.cc

+24 −22

Original line number	Diff line number	Diff line
		@@ -34,25 +34,25 @@ namespace clip::plotgen {
		void legend_item_normalize(
		Context* ctx,
		LegendItem* config) {
		convert_unit_typographic(
		layer_get_dpi(ctx),
		layer_get_font_size(ctx),
		&config->label_font_size);

		convert_unit_typographic(
		layer_get_dpi(ctx),
		config->label_font_size,
		&config->label_margin);

		convert_unit_typographic(
		layer_get_dpi(ctx),
		layer_get_font_size(ctx),
		&config->marker_size);

		convert_unit_typographic(
		layer_get_dpi(ctx),
		config->marker_size,
		&config->marker_margin);
		//convert_unit_typographic(
		// layer_get_dpi(ctx),
		// layer_get_font_size(ctx),
		// &config->label_font_size);

		//convert_unit_typographic(
		// layer_get_dpi(ctx),
		// config->label_font_size,
		// &config->label_margin);

		//convert_unit_typographic(
		// layer_get_dpi(ctx),
		// layer_get_font_size(ctx),
		// &config->marker_size);

		//convert_unit_typographic(
		// layer_get_dpi(ctx),
		// config->marker_size,
		// &config->marker_margin);
		}

		ReturnCode legend_item_calculate_size(
		@@ -172,11 +172,13 @@ ReturnCode legend_item_configure(
		Context* ctx,
		const Expr* expr,
		LegendItem* config) {
		const auto& layer = *layer_get(ctx);

		/* inherit defaults */
		config->label_align = HAlign::LEFT;
		config->label_margin = from_em(1.1);
		config->label_font = layer_get_font(ctx);
		config->label_font_size = from_em(1);
		config->label_font_size = layer_get_font_size(ctx);
		config->label_color = layer_get(ctx)->text_color;
		config->marker = marker_create_disk();
		config->marker_align = HAlign::LEFT;
		@@ -199,7 +201,7 @@ ReturnCode legend_item_configure(
		{"label-margin", std::bind(&measure_read, _1, &config->label_margin)},
		{"label-color", std::bind(&color_read, ctx, _1, &config->label_color)},
		{"label-font", expr_call_string_fn(std::bind(&font_load_best, _1, &config->label_font))},
		{"label-font-size", std::bind(&measure_read, _1, &config->label_font_size)},
		{"label-font-size", std::bind(&expr_to_font_size, _1, layer, &config->label_font_size)},
		{"marker-shape", std::bind(&marker_configure, _1, &config->marker)},
		{
		"marker-align",
		@@ -210,7 +212,7 @@ ReturnCode legend_item_configure(
		},
		{"marker-margin", std::bind(&measure_read, _1, &config->marker_margin)},
		{"marker-color", std::bind(&color_read, ctx, _1, &config->marker_color)},
		{"marker-size", std::bind(&measure_read, _1, &config->marker_size)},
		{"marker-size", std::bind(&expr_to_font_size, _1, layer, &config->marker_size)},
		{"color", std::bind(&color_read, ctx, _1, &config->marker_color)},
		});

src/figure/legend_item.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,12 +23,12 @@ struct LegendItem {
		Measure label_margin;
		Color label_color;
		FontInfo label_font;
		Measure label_font_size;
		Number label_font_size;
		Marker marker;
		HAlign marker_align;
		Measure marker_margin;
		Color marker_color;
		Measure marker_size;
		Number marker_size;
		};

		ReturnCode legend_item_configure(

src/graphics/draw.cc

+0 −5

Original line number	Diff line number	Diff line
		@@ -21,11 +21,6 @@ void draw_polygon(
		const Poly2& poly,
		StrokeStyle stroke_style,
		FillStyle fill_style) {
		convert_unit_typographic(
		layer_get_dpi(ctx),
		layer_get_font_size(ctx),
		&stroke_style.line_width);

		DrawCommand elem;
		elem.path = path_from_poly2(poly);
		elem.stroke_style = stroke_style;

Admin message