Cleanup SPIFloat and default values in styles (b233c4c0) · Commits · Inkscape / inkscape · GitLab

+3 −3

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@ objects_query_fillstroke (const std::vector<SPItem> &objects, SPStyle style_re
		// 2. Sum color, copy server from paint to paint_res
		if (paint_res->set && paint->isColor()) {
		auto copy = paint->getColor();
		copy.addOpacity(isfill ? style->fill_opacity : style->stroke_opacity);
		copy.addOpacity(isfill ? style->fill_opacity.as_double() : style->stroke_opacity.as_double());

		if (colors.isEmpty()) {
		paint_res->setColor(copy);
		@@ -570,7 +570,7 @@ objects_query_opacity (const std::vector<SPItem> &objects, SPStyle style_res)
		continue;
		}

		double opacity = SP_SCALE24_TO_FLOAT(style->opacity.value);
		double opacity = style->opacity.as_double();
		opacity_sum += opacity;
		if (opacity_prev != -1 && opacity != opacity_prev) {
		same_opacity = false;
		@@ -582,7 +582,7 @@ objects_query_opacity (const std::vector<SPItem> &objects, SPStyle style_res)
		opacity_sum /= opacity_items;
		}

		style_res->opacity.value = SP_SCALE24_FROM_FLOAT(opacity_sum);
		style_res->opacity.set_double(opacity_sum);

		if (opacity_items == 0) {
		return QUERY_STYLE_NOTHING;

+1 −1

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ DrawingItem *DrawingShape::_pickItem(Geom::Point const &p, double delta, unsigne
		bool outline = flags & PICK_OUTLINE;
		bool pick_as_clip = flags & PICK_AS_CLIP;

		if (SP_SCALE24_TO_FLOAT(style_opacity) == 0 && !outline && !pick_as_clip && !_drawing.selectZeroOpacity()) {
		if (style_opacity == 0 && !outline && !pick_as_clip && !_drawing.selectZeroOpacity()) {
		// fully transparent, no pick unless outline mode
		return nullptr;
		}

+17 −17

Original line number	Diff line number	Diff line
		@@ -124,9 +124,9 @@ NRStyleData::NRStyleData(SPStyle const style, SPStyle const context_style)
		}

		fill.set(style_fill);
		fill.opacity = style->fill_opacity;
		fill.opacity = style->fill_opacity.as_double();

		switch (style->fill_rule.computed) {
		switch (style->fill_rule.as_enum()) {
		case SP_WIND_RULE_EVENODD:
		fill_rule = CAIRO_FILL_RULE_EVEN_ODD;
		break;
		@@ -153,10 +153,10 @@ NRStyleData::NRStyleData(SPStyle const style, SPStyle const context_style)
		}

		stroke.set(style_stroke);
		stroke.opacity = SP_SCALE24_TO_FLOAT(style->stroke_opacity.value);
		stroke_width = style->stroke_width.computed;
		stroke.opacity = style->stroke_opacity.as_double();
		stroke_width = style->stroke_width.as_double();
		hairline = style->stroke_extensions.hairline;
		switch (style->stroke_linecap.computed) {
		switch (style->stroke_linecap.as_enum()) {
		case SP_STROKE_LINECAP_ROUND:
		line_cap = CAIRO_LINE_CAP_ROUND;
		break;
		@@ -169,7 +169,7 @@ NRStyleData::NRStyleData(SPStyle const style, SPStyle const context_style)
		default:
		g_assert_not_reached();
		}
		switch (style->stroke_linejoin.computed) {
		switch (style->stroke_linejoin.as_enum()) {
		case SP_STROKE_LINEJOIN_ROUND:
		line_join = CAIRO_LINE_JOIN_ROUND;
		break;
		@@ -182,14 +182,14 @@ NRStyleData::NRStyleData(SPStyle const style, SPStyle const context_style)
		default:
		g_assert_not_reached();
		}
		miter_limit = style->stroke_miterlimit.value;
		miter_limit = style->stroke_miterlimit.as_double();

		int const n_dash = style->stroke_dasharray.values.size();
		if (n_dash > 0 && style->stroke_dasharray.is_valid()) {
		dash_offset = style->stroke_dashoffset.computed;
		dash_offset = style->stroke_dashoffset.as_double();
		dash.resize(n_dash);
		for (int i = 0; i < n_dash; ++i) {
		dash[i] = style->stroke_dasharray.values[i].computed;
		dash[i] = style->stroke_dasharray.values[i].as_double();
		}
		}

		@@ -244,8 +244,8 @@ NRStyleData::NRStyleData(SPStyle const style, SPStyle const context_style)
		// decoration to the fill and stroke values of that ancestor.
		auto style_td = style;
		if (style->text_decoration.style_td) style_td = style->text_decoration.style_td;
		text_decoration_stroke.opacity = SP_SCALE24_TO_FLOAT(style_td->stroke_opacity.value);
		text_decoration_stroke_width = style_td->stroke_width.computed;
		text_decoration_stroke.opacity = style_td->stroke_opacity.as_double();
		text_decoration_stroke_width = style_td->stroke_width.as_double();

		// Priority is given in order:
		// * text_decoration_fill
		@@ -292,10 +292,10 @@ NRStyleData::NRStyleData(SPStyle const style, SPStyle const context_style)
		underline_position = style->text_decoration_data.underline_position;
		line_through_thickness = style->text_decoration_data.line_through_thickness;
		line_through_position = style->text_decoration_data.line_through_position;
		font_size = style->font_size.computed;
		font_size = style->font_size;
		}

		text_direction = style->direction.computed;
		text_direction = style->direction.as_enum();
		}

		auto NRStyle::preparePaint(Inkscape::DrawingContext &dc, Inkscape::RenderContext &rc, Geom::IntRect const &area, Geom::OptRect const &paintbox, Inkscape::DrawingPattern const *pattern, NRStyleData::Paint const &paint, CachedPattern const &cp) const -> CairoPatternUniqPtr

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ struct NRStyleData
		Paint stroke;
		float stroke_width;
		bool hairline;
		float miter_limit;
		double miter_limit;
		std::vector<double> dash;
		float dash_offset;
		cairo_fill_rule_t fill_rule;

+4 −4

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ void TranslucencyGroup::setSolidItem(SPItem *item)
		// Reset all the items in the list.
		for (auto &item : _translucent_items) {
		if (auto arenaitem = item->get_arenaitem(_dkey)) {
		arenaitem->setOpacity(SP_SCALE24_TO_FLOAT(item->style->opacity.value));
		arenaitem->setOpacity(item->style->opacity.as_double());
		}
		}
		_translucent_items.clear();

推荐订阅源

Martin Owens activity