New UX for text in shape and text in path (dabd763c) · Commits · Martin Owens / inkscape · GitLab

+530 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8" standalone="no"?>
		<svg
		width="32"
		height="32"
		x="-5.5"
		y="-5.5"
		style="fill:gray;stroke:black"
		version="1.1"
		id="svg2"
		sodipodi:docname="text-in-shape.svg"
		inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
		xml:space="preserve"
		xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
		xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
		xmlns:xlink="http://www.w3.org/1999/xlink"
		xmlns="http://www.w3.org/2000/svg"
		xmlns:svg="http://www.w3.org/2000/svg"><style
		id="style1">@import './cursors.css';</style><style
		id="style2">@import './cursors.css';</style><sodipodi:namedview
		id="namedview1"
		pagecolor="#ffffff"
		bordercolor="#000000"
		borderopacity="0.25"
		inkscape:showpageshadow="2"
		inkscape:pageopacity="0.0"
		inkscape:pagecheckerboard="0"
		inkscape:deskcolor="#d1d1d1"
		inkscape:document-units="px"
		showgrid="true"
		inkscape:zoom="11.118189"
		inkscape:cx="17.089114"
		inkscape:cy="11.96238"
		inkscape:window-width="1280"
		inkscape:window-height="1371"
		inkscape:window-maximized="0"
		inkscape:current-layer="cursor-98"
		inkscape:window-x="20"
		inkscape:window-y="20"
		showguides="false"><inkscape:grid
		type="modular"
		id="grid1"
		units="px"
		originx="-124"
		originy="-44"
		spacingx="32"
		spacingy="32"
		empcolor="#0047cb"
		empopacity="0.30196078"
		color="#0047cb"
		opacity="0.14902"
		empspacing="0"
		enabled="true"
		visible="true"
		marginx="0"
		marginy="0"
		gapx="8"
		gapy="8" /><inkscape:grid
		type="xygrid"
		id="grid2"
		units="px"
		originx="-128"
		originy="-48"
		spacingx="1"
		spacingy="1"
		empcolor="#0099e5"
		empopacity="0.30196078"
		color="#0099e5"
		opacity="0.14902"
		empspacing="4"
		enabled="true"
		visible="true" /><inkscape:grid
		id="grid21"
		units="px"
		originx="-128"
		originy="-48"
		spacingx="0.5"
		spacingy="0.5"
		empcolor="#0099e5"
		empopacity="0.14901961"
		color="#0099e5"
		opacity="0.101961"
		empspacing="2"
		enabled="true"
		visible="true" /></sodipodi:namedview><defs
		id="defs1"><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect1"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,2,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.5,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.5,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,2,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="true"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect94"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,3.1622777,0,1 @ F,0,0,1,0,3,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,3,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,2,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="true"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect255"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect253"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect251"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9429179,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect247"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect245"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect242"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,3.9031376,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><filter
		id="def-drop-shadow"
		filterUnits="userSpaceOnUse"
		x="0"
		y="0"
		width="32"
		height="32"><feOffset
		dx="1"
		dy="1"
		in="SourceAlpha"
		result="offOut"
		id="feOffset1" /><feComponentTransfer
		id="feComponentTransfer1"><feFuncR
		type="identity"
		id="feFuncR1" /><feFuncG
		type="identity"
		id="feFuncG1" /><feFuncB
		type="identity"
		id="feFuncB1" /><!-- Shadow's transparency --><feFuncA
		slope="0.40"
		type="linear"
		id="feFuncA1" /></feComponentTransfer><feGaussianBlur
		result="blurOut"
		stdDeviation="1"
		id="feGaussianBlur1" /><feBlend
		in="SourceGraphic"
		in2="blurOut"
		id="feBlend1"
		mode="normal" /></filter><filter
		id="def-drop-shadow-5"
		filterUnits="userSpaceOnUse"
		x="0"
		y="0"
		width="32"
		height="32"><feOffset
		dx="1"
		dy="1"
		in="SourceAlpha"
		result="offOut"
		id="feOffset1-4" /><feComponentTransfer
		id="feComponentTransfer1-3"><feFuncR
		type="identity"
		id="feFuncR1-6" /><feFuncG
		type="identity"
		id="feFuncG1-5" /><feFuncB
		type="identity"
		id="feFuncB1-9" /><!-- Shadow's transparency --><feFuncA
		slope="0.40"
		type="linear"
		id="feFuncA1-5" /></feComponentTransfer><feGaussianBlur
		result="blurOut"
		stdDeviation="1"
		id="feGaussianBlur1-4" /><feBlend
		in="SourceGraphic"
		in2="blurOut"
		id="feBlend1-9"
		mode="normal" /></filter><filter
		id="def-drop-shadow-3"
		filterUnits="userSpaceOnUse"
		x="0"
		y="0"
		width="32"
		height="32"><feOffset
		dx="1"
		dy="1"
		in="SourceAlpha"
		result="offOut"
		id="feOffset1-3" /><feComponentTransfer
		id="feComponentTransfer1-7"><feFuncR
		type="identity"
		id="feFuncR1-7" /><feFuncG
		type="identity"
		id="feFuncG1-3" /><feFuncB
		type="identity"
		id="feFuncB1-2" /><!-- Shadow's transparency --><feFuncA
		slope="0.40"
		type="linear"
		id="feFuncA1-56" /></feComponentTransfer><feGaussianBlur
		result="blurOut"
		stdDeviation="1"
		id="feGaussianBlur1-3" /><feBlend
		in="SourceGraphic"
		in2="blurOut"
		id="feBlend1-4"
		mode="normal" /></filter><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect251-2"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9429179,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect255-7"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><inkscape:path-effect
		effect="fillet_chamfer"
		id="path-effect247-0"
		is_visible="true"
		lpeversion="1"
		nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,2.9580747,0,1 @ F,0,0,1,0,1.008945,0,1 @ F,0,0,1,0,0,0,1"
		radius="0"
		unit="px"
		method="auto"
		mode="F"
		chamfer_steps="1"
		flexible="false"
		use_knot_distance="true"
		apply_no_radius="true"
		apply_with_radius="true"
		only_selected="false"
		hide_knots="false" /><filter
		id="def-drop-shadow-9"
		filterUnits="userSpaceOnUse"
		x="0"
		y="0"
		width="32"
		height="32"><feOffset
		dx="1"
		dy="1"
		in="SourceAlpha"
		result="offOut"
		id="feOffset1-36" /><feComponentTransfer
		id="feComponentTransfer1-0"><feFuncR
		type="identity"
		id="feFuncR1-62" /><feFuncG
		type="identity"
		id="feFuncG1-6" /><feFuncB
		type="identity"
		id="feFuncB1-1" /><!-- Shadow's transparency --><feFuncA
		slope="0.40"
		type="linear"
		id="feFuncA1-8" /></feComponentTransfer><feGaussianBlur
		result="blurOut"
		stdDeviation="1"
		id="feGaussianBlur1-7" /><feBlend
		in="SourceGraphic"
		in2="blurOut"
		id="feBlend1-92"
		mode="normal" /></filter><filter
		id="def-drop-shadow-1"
		filterUnits="userSpaceOnUse"
		x="0"
		y="0"
		width="32"
		height="32"><feOffset
		dx="1"
		dy="1"
		in="SourceAlpha"
		result="offOut"
		id="feOffset1-2" /><feComponentTransfer
		id="feComponentTransfer1-70"><feFuncR
		type="identity"
		id="feFuncR1-93" /><feFuncG
		type="identity"
		id="feFuncG1-60" /><feFuncB
		type="identity"
		id="feFuncB1-6" /><!-- Shadow's transparency --><feFuncA
		slope="0.40"
		type="linear"
		id="feFuncA1-2" /></feComponentTransfer><feGaussianBlur
		result="blurOut"
		stdDeviation="1"
		id="feGaussianBlur1-6" /><feBlend
		in="SourceGraphic"
		in2="blurOut"
		id="feBlend1-1"
		mode="normal" /></filter><filter
		id="def-drop-shadow-5-8"
		filterUnits="userSpaceOnUse"
		x="0"
		y="0"
		width="32"
		height="32"><feOffset
		dx="1"
		dy="1"
		in="SourceAlpha"
		result="offOut"
		id="feOffset1-8" /><feComponentTransfer
		id="feComponentTransfer1-2"><feFuncR
		type="identity"
		id="feFuncR1-9" /><feFuncG
		type="identity"
		id="feFuncG1-8" /><feFuncB
		type="identity"
		id="feFuncB1-2-7" /><!-- Shadow's transparency --><feFuncA
		slope="0.40"
		type="linear"
		id="feFuncA1-0" /></feComponentTransfer><feGaussianBlur
		result="blurOut"
		stdDeviation="1"
		id="feGaussianBlur1-7-9" /><feBlend
		in="SourceGraphic"
		in2="blurOut"
		id="feBlend1-4-2"
		mode="normal" /></filter><filter
		id="def-drop-shadow-9-0"
		filterUnits="userSpaceOnUse"
		x="0"
		y="0"
		width="32"
		height="32"><feOffset
		dx="1"
		dy="1"
		in="SourceAlpha"
		result="offOut"
		id="feOffset1-3-2" /><feComponentTransfer
		id="feComponentTransfer1-4"><feFuncR
		type="identity"
		id="feFuncR1-0" /><feFuncG
		type="identity"
		id="feFuncG1-7" /><feFuncB
		type="identity"
		id="feFuncB1-5" /><!-- Shadow's transparency --><feFuncA
		slope="0.40"
		type="linear"
		id="feFuncA1-7" /></feComponentTransfer><feGaussianBlur
		result="blurOut"
		stdDeviation="1"
		id="feGaussianBlur1-5" /><feBlend
		in="SourceGraphic"
		in2="blurOut"
		id="feBlend1-0"
		mode="normal" /></filter></defs><g
		inkscape:label="Layer 1"
		inkscape:groupmode="layer"
		id="layer1"
		inkscape:highlight-color="#000000"
		transform="translate(-128,-48)"><g
		id="g167"
		inkscape:label="text"><use
		x="0"
		y="0"
		xlink:href="#g48"
		id="use57"
		inkscape:label="bbox"
		transform="translate(240.01229,-40)" /><g
		id="cross-41"
		transform="translate(129,49)"
		style="fill:#808080;stroke:#000000"><path
		d="M 4.5,9 V 0"
		stroke="#ffffff"
		stroke-width="3"
		id="path1-081" /><path
		d="M 9,4.5 H 0"
		stroke="#ffffff"
		stroke-width="3"
		id="path2-48" /><path
		d="M 0,4.5 H 9"
		stroke="#000000"
		id="path3-84"
		style="fill:none" /><path
		d="M 4.5,0 V 9"
		stroke="#000000"
		id="path4-57"
		style="fill:none" /></g><g
		id="cursor-98"
		class="drop-shadow"
		transform="translate(129,49)"><g
		style="fill:#808080;stroke:#000000"
		id="g1"
		transform="translate(-18.747931,28.278633)"><path
		id="rect63"
		style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
		d="m 25.859997,-15.760271 -0.112066,14.481638 h 16 l 5,-5 v -16.5 l -12.887934,0.01836 c -4.112066,-0.01836 -8.112066,3.48164 -8,7.000002 z"
		sodipodi:nodetypes="ccccccc" /><path
		style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
		d="m 41.247931,-2.778633 4,-4 v -14.5 h -10.5 c -4,0 -7.5,2.5 -7.5,6 v 12.5 z"
		id="path63"
		sodipodi:nodetypes="ccccccc" /></g><path
		d="m 11,11.5 -0.5,5 h 2 l 0.171202,-1.027212 A 2.3609208,2.3609208 139.73116 0 1 15,13.5 h 1.5 v 7.5 1 a 1.7706906,1.7706906 130.26884 0 1 -1.479591,1.746598 L 13.5,24 v 1.5 h 9 V 24 L 20.979591,23.746598 A 1.7706906,1.7706906 49.731161 0 1 19.5,22 V 21 13.5 H 21 a 2.3609208,2.3609208 40.268839 0 1 2.328798,1.972788 L 23.5,16.5 h 2 l -0.5,-5 z"
		stroke="#ffffff"
		id="path5-4"
		sodipodi:nodetypes="ccccccccccccccccccc"
		style="fill:#000000;fill-opacity:1"
		inkscape:path-effect="#path-effect1"
		inkscape:original-d="m 11,11.5 -0.5,5 h 2 l 0.5,-3 h 3.5 v 7.5 2.5 l -3,0.5 v 1.5 h 9 V 24 l -3,-0.5 V 21 13.5 H 23 l 0.5,3 h 2 l -0.5,-5 z"
		transform="translate(-0.32879797,-0.97278785)" /></g></g></g><g
		inkscape:groupmode="layer"
		id="layer2"
		inkscape:label="Masters"
		inkscape:highlight-color="#000000"
		transform="translate(-128,-48)"><g
		id="g48"
		inkscape:label="bouncing box"
		style="fill:#ffd5d5;fill-opacity:0"><rect
		style="opacity:1;fill:#ffd5d5;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1"
		id="rect4-6"
		width="32"
		height="32"
		x="-112.01229"
		y="88"
		inkscape:label="bbox" /></g></g><style
		id="style1-6">@import './cursors.css';</style><style
		id="style2-7">@import './cursors.css';</style><style
		id="style1-67">@import './cursors.css';</style><style
		id="style2-5">@import './cursors.css';</style></svg>

+460 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −3

Original line number	Diff line number	Diff line
		@@ -309,9 +309,7 @@ bool Inkscape::AlignmentSnapper::getSnapperAlwaysSnap(SnapSourceType const &/*so

		Geom::Coord Inkscape::AlignmentSnapper::getSnapperTolerance() const
		{
		SPDesktop const *dt = _snapmanager->getDesktop();
		double const zoom = dt ? dt->current_zoom() : 1;
		return _snapmanager->snapprefs.getAlignmentTolerance() / zoom;
		return _snapmanager->getSnapperTolerance(_snapmanager->snapprefs.getAlignmentTolerance());
		}

		Inkscape::SnapSourceType Inkscape::AlignmentSnapper::source2alignment(SnapSourceType s) const

+2 −2

Original line number	Diff line number	Diff line
		@@ -364,11 +364,11 @@ SPItem *SPDesktop::getItemAtPoint(Geom::Point const &p, bool into_groups, SPItem
		return doc()->getItemAtPoint( dkey, p, into_groups, upto);
		}

		std::vector<SPItem*> SPDesktop::getItemsAtPoints(std::vector<Geom::Point> points, bool all_layers, bool topmost_only, size_t limit, bool active_only) const
		std::vector<SPItem*> SPDesktop::getItemsAtPoints(std::vector<Geom::Point> points, bool all_layers, bool topmost_only, size_t limit, bool active_only, double distance) const
		{
		if (!doc())
		return {};
		return doc()->getItemsAtPoints(dkey, points, all_layers, topmost_only, limit, active_only);
		return doc()->getItemsAtPoints(dkey, points, all_layers, topmost_only, limit, active_only, distance);
		}

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ public:
		void set_coordinate_status(Geom::Point const &p);
		SPItem getItemFromListAtPointBottom(std::vector<SPItem > const &list, Geom::Point const &p) const;
		SPItem getItemAtPoint(Geom::Point const &p, bool into_groups, SPItem upto = nullptr) const;
		std::vector<SPItem*> getItemsAtPoints(std::vector<Geom::Point> ps, bool all_layers = true, bool topmost_only = true, size_t limit = 0, bool active_only = true) const;
		std::vector<SPItem*> getItemsAtPoints(std::vector<Geom::Point> ps, bool all_layers = true, bool topmost_only = true, size_t limit = 0, bool active_only = true, double distance = 0.25) const;
		SPItem *getGroupAtPoint(Geom::Point const &p) const;
		Geom::Point point() const;

推荐订阅源

Martin Owens activity