shot - make crop handles biger and easier to see in corner cases

This commit is contained in:
Carsten Haitzler 2020-01-05 14:34:58 +00:00
parent d23615046b
commit 812ca88938
6 changed files with 60 additions and 162 deletions

View File

@ -1,101 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="72"
height="72"
viewBox="0 0 19.05 19.05"
version="1.1"
id="svg8"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="shotedit-crop-corner.svg"
inkscape:export-filename="/home/raster/C/shotedit/shotedit-crop3.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs2">
<linearGradient
inkscape:collect="always"
id="linearGradient823">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop819" />
<stop
id="stop827"
offset="0.5"
style="stop-color:#ffffff;stop-opacity:0.8277635" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop821" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient823"
id="radialGradient825"
cx="1.0942754e-06"
cy="277.94995"
fx="1.0942754e-06"
fy="277.94995"
r="8.4666665"
gradientTransform="matrix(-1.0767077e-6,1.7499995,-1.7500002,-1.0767081e-6,486.41248,277.9503)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#404040"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="16.708333"
inkscape:cx="19.481296"
inkscape:cy="36.089776"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
width="800px"
inkscape:window-width="2560"
inkscape:window-height="1377"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid816"
empspacing="8" />
</sodipodi:namedview>
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-277.95)">
<path
style="fill:url(#radialGradient825);fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="M 0,294.88333 H 2.1166666 V 280.06667 H 16.933333 V 277.95 H 0 Z"
id="path817"
inkscape:connector-curvature="0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 421 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 467 B

View File

@ -51,10 +51,6 @@ collections {
TOOL_ICON("box-text-kaboom")
TOOL_ICON("box-text-kapow")
group { name: "e/modules/shot/tool/crop";
images.image: "shotedit-crop1.png" COMP;
images.image: "shotedit-crop2.png" COMP;
images.image: "shotedit-crop3.png" COMP;
images.image: "shotedit-crop4.png" COMP;
parts {
part { name: "e/drag/rel1"; type: SPACER;
dragable.x: 1 1 0;
@ -115,64 +111,67 @@ collections {
color: 0 0 0 192;
}
}
part { name: "mod-tl";
scale: 1;
description { state: "default" 0.0;
rel.to: "e/drag/rel1";
rel1.offset: -18 -18;
rel2.relative: 0.0 0.0;
offscale;
image.normal: "shotedit-crop1.png";
}
}
program { signal: "mouse,down,1"; source: "mod-tl";
action: SIGNAL_EMIT "action,resize,tl,begin" "e";
}
part { name: "mod-tr";
scale: 1;
description { state: "default" 0.0;
rel.to_x: "e/drag/rel2";
rel.to_y: "e/drag/rel1";
rel1.offset: 0 -18;
rel1.relative: 1.0 0.0;
rel2.offset: 18 -1;
rel2.relative: 1.0 0.0;
offscale;
image.normal: "shotedit-crop2.png";
}
}
program { signal: "mouse,down,1"; source: "mod-tr";
action: SIGNAL_EMIT "action,resize,tr,begin" "e";
}
part { name: "mod-bl";
scale: 1;
description { state: "default" 0.0;
rel.to_x: "e/drag/rel1";
rel.to_y: "e/drag/rel2";
rel1.offset: -18 0;
rel1.relative: 0.0 1.0;
rel2.offset: -1 18;
rel2.relative: 0.0 1.0;
offscale;
image.normal: "shotedit-crop4.png";
}
}
program { signal: "mouse,down,1"; source: "mod-bl";
action: SIGNAL_EMIT "action,resize,bl,begin" "e";
}
part { name: "mod-br";
scale: 1;
description { state: "default" 0.0;
rel.to: "e/drag/rel2";
rel1.offset: 0 0;
rel2.offset: 18 18;
offscale;
image.normal: "shotedit-crop3.png";
}
}
program { signal: "mouse,down,1"; source: "mod-br";
action: SIGNAL_EMIT "action,resize,br,begin" "e";
#define HANDLE(_name, _relnamex, _relnamey, _rel, _x1, _y1, _x2, _y2, _x3, _y3, _x4, _y4, _x5, _y5, _x6, _y6, _x7, _y7, _x8, _y8) \
part { name: "mod-"_name"1"; type: RECT; \
scale: 1; \
description { state: "default" 0.0; \
rel.to_x: "e/drag/"_relnamex; \
rel.to_y: "e/drag/"_relnamey; \
rel1.offset: _x1 _y1; \
rel2.offset: _x2 _y2; \
rel2.relative: _rel; \
color: 255 255 255 255; \
offscale; \
} \
} \
part { name: "mod-"_name"2"; type: RECT; \
scale: 1; \
description { state: "default" 0.0; \
rel.to_x: "e/drag/"_relnamex; \
rel.to_y: "e/drag/"_relnamey; \
rel1.offset: _x3 _y3; \
rel2.offset: _x4 _y4; \
rel2.relative: _rel; \
color: 255 255 255 255; \
offscale; \
} \
} \
part { name: "mod-"_name"h1"; type: RECT; \
scale: 1; \
description { state: "default" 0.0; \
rel.to_x: "e/drag/"_relnamex; \
rel.to_y: "e/drag/"_relnamey; \
rel1.offset: _x5 _y5; \
rel2.offset: _x6 _y6; \
rel2.relative: _rel; \
color: 0 0 0 0; \
offscale; \
} \
} \
part { name: "mod-"_name"h2"; type: RECT; \
scale: 1; \
description { state: "default" 0.0; \
rel.to_x: "e/drag/"_relnamex; \
rel.to_y: "e/drag/"_relnamey; \
rel1.offset: _x7 _y7; \
rel2.offset: _x8 _y8; \
rel2.relative: _rel; \
color: 0 0 0 0; \
offscale; \
} \
} \
program { signal: "mouse,down,1"; source: "mod-"_name"h*"; \
action: SIGNAL_EMIT "action,resize,"_name",begin" "e"; \
}
HANDLE("tl", "rel1", "rel1", 0.0 0.0, -18, -4, 17, -1, -4, -18, -1, 17,
-36, -36, 17, -1, -36, -36, -1, 17)
HANDLE("tr", "rel2", "rel1", 1.0 0.0, -18, -4, 17, -1, 0, -18, 3, 17,
-18, -36, 35, -1, 0, -36, 35, 35)
HANDLE("bl", "rel1", "rel2", 0.0 1.0, -18, 0, 17, 3, -4, -18, -1, 17,
-36, 0, 17, 35, -36, -18, -1, 35)
HANDLE("br", "rel2", "rel2", 1.0 1.0, -18, 0, 17, 3, 0, -18, 3, 17,
-18, 0, 35, 35, 0, -36, 35, 35)
}
}
group { name: "e/modules/shot/tool/line/handle";