Commit a907a4aa authored by Chris Chris's avatar Chris Chris Committed by Jan Blackquill
Browse files

Fix cursor build script generating pngs that are too small

The cursor build scripts generate pngs that are too small when using Inkscape 0.92 or later due to Inkscape changing its default dpi from 90 to 96. Changed script to use width and height flags as they produce png files with correct dimensions on all Inkscape versions.

BUG: 453365
parent b4cff8d1
Pipeline #171594 passed with stage
in 2 minutes and 18 seconds
......@@ -61,15 +61,15 @@ for CUR in src/config/*.cursor; do
echo -ne "\033[0KGenerating simple cursor pixmaps... $BASENAME\\r"
if [ "$DIR1X/$BASENAME.png" -ot $RAWSVG ] ; then
inkscape -i $BASENAME -d 90 -f $RAWSVG -e "$DIR1X/$BASENAME.png" > /dev/null
inkscape -i $BASENAME -w 32 -h 32 -f $RAWSVG -e "$DIR1X/$BASENAME.png" > /dev/null
fi
if [ "$DIR1_5X/$BASENAME.png" -ot $RAWSVG ] ; then
inkscape -i $BASENAME -d 135 -f $RAWSVG -e "$DIR1_5X/$BASENAME.png" > /dev/null
inkscape -i $BASENAME -w 48 -h 48 -f $RAWSVG -e "$DIR1_5X/$BASENAME.png" > /dev/null
fi
if [ "$DIR2X/$BASENAME.png" -ot $RAWSVG ] ; then
inkscape -i $BASENAME -d 180 -f $RAWSVG -e "$DIR2X/$BASENAME.png" > /dev/null
inkscape -i $BASENAME -w 64 -h 64 -f $RAWSVG -e "$DIR2X/$BASENAME.png" > /dev/null
fi
done
echo -e "\033[0KGenerating simple cursor pixmaps... DONE"
......@@ -81,27 +81,27 @@ do
echo -ne "\033[0KGenerating animated cursor pixmaps... $i / 23 \\r"
if [ "$DIR1X/progress-$i.png" -ot $RAWSVG ] ; then
inkscape -i progress-$i -d 90 -f $RAWSVG -e "$DIR1X/progress-$i.png" > /dev/null
inkscape -i progress-$i -w 32 -h 32 -f $RAWSVG -e "$DIR1X/progress-$i.png" > /dev/null
fi
if [ "$DIR1_5X/progress-$i.png" -ot $RAWSVG ] ; then
inkscape -i progress-$i -d 135 -f $RAWSVG -e "$DIR1_5X/progress-$i.png" > /dev/null
inkscape -i progress-$i -w 48 -h 48 -f $RAWSVG -e "$DIR1_5X/progress-$i.png" > /dev/null
fi
if [ "$DIR2X/progress-$i.png" -ot $RAWSVG ] ; then
inkscape -i progress-$i -d 180 -f $RAWSVG -e "$DIR2X/progress-$i.png" > /dev/null
inkscape -i progress-$i -w 64 -h 64 -f $RAWSVG -e "$DIR2X/progress-$i.png" > /dev/null
fi
if [ "$DIR1X/wait-$i.png" -ot $RAWSVG ] ; then
inkscape -i wait-$i -d 90 -f $RAWSVG -e "$DIR1X/wait-$i.png" > /dev/null
inkscape -i wait-$i -w 32 -h 32 -f $RAWSVG -e "$DIR1X/wait-$i.png" > /dev/null
fi
if [ "$DIR1_5X/wait-$i.png" -ot $RAWSVG ] ; then
inkscape -i wait-$i -d 135 -f $RAWSVG -e "$DIR1_5X/wait-$i.png" > /dev/null
inkscape -i wait-$i -w 48 -h 48 -f $RAWSVG -e "$DIR1_5X/wait-$i.png" > /dev/null
fi
if [ "$DIR2X/wait-$i.png" -ot $RAWSVG ] ; then
inkscape -i wait-$i -d 180 -f $RAWSVG -e "$DIR2X/wait-$i.png" > /dev/null
inkscape -i wait-$i -w 64 -h 64 -f $RAWSVG -e "$DIR2X/wait-$i.png" > /dev/null
fi
done
echo -e "\033[0KGenerating animated cursor pixmaps... DONE"
......
......@@ -61,15 +61,15 @@ for CUR in src/config/*.cursor; do
echo -ne "\033[0KGenerating simple cursor pixmaps... $BASENAME\\r"
if [ "$DIR1X/$BASENAME.png" -ot $RAWSVG ] ; then
inkscape -i $BASENAME -d 90 -f $RAWSVG -e "$DIR1X/$BASENAME.png" > /dev/null
inkscape -i $BASENAME -w 32 -h 32 -f $RAWSVG -e "$DIR1X/$BASENAME.png" > /dev/null
fi
if [ "$DIR1_5X/$BASENAME.png" -ot $RAWSVG ] ; then
inkscape -i $BASENAME -d 135 -f $RAWSVG -e "$DIR1_5X/$BASENAME.png" > /dev/null
inkscape -i $BASENAME -w 48 -h 48 -f $RAWSVG -e "$DIR1_5X/$BASENAME.png" > /dev/null
fi
if [ "$DIR2X/$BASENAME.png" -ot $RAWSVG ] ; then
inkscape -i $BASENAME -d 180 -f $RAWSVG -e "$DIR2X/$BASENAME.png" > /dev/null
inkscape -i $BASENAME -w 64 -h 64 -f $RAWSVG -e "$DIR2X/$BASENAME.png" > /dev/null
fi
done
echo -e "\033[0KGenerating simple cursor pixmaps... DONE"
......@@ -81,27 +81,27 @@ do
echo -ne "\033[0KGenerating animated cursor pixmaps... $i / 23 \\r"
if [ "$DIR1X/progress-$i.png" -ot $RAWSVG ] ; then
inkscape -i progress-$i -d 90 -f $RAWSVG -e "$DIR1X/progress-$i.png" > /dev/null
inkscape -i progress-$i -w 32 -h 32 -f $RAWSVG -e "$DIR1X/progress-$i.png" > /dev/null
fi
if [ "$DIR1_5X/progress-$i.png" -ot $RAWSVG ] ; then
inkscape -i progress-$i -d 135 -f $RAWSVG -e "$DIR1_5X/progress-$i.png" > /dev/null
inkscape -i progress-$i -w 48 -h 48 -f $RAWSVG -e "$DIR1_5X/progress-$i.png" > /dev/null
fi
if [ "$DIR2X/progress-$i.png" -ot $RAWSVG ] ; then
inkscape -i progress-$i -d 180 -f $RAWSVG -e "$DIR2X/progress-$i.png" > /dev/null
inkscape -i progress-$i -w 64 -h 64 -f $RAWSVG -e "$DIR2X/progress-$i.png" > /dev/null
fi
if [ "$DIR1X/wait-$i.png" -ot $RAWSVG ] ; then
inkscape -i wait-$i -d 90 -f $RAWSVG -e "$DIR1X/wait-$i.png" > /dev/null
inkscape -i wait-$i -w 32 -h 32 -f $RAWSVG -e "$DIR1X/wait-$i.png" > /dev/null
fi
if [ "$DIR1_5X/wait-$i.png" -ot $RAWSVG ] ; then
inkscape -i wait-$i -d 135 -f $RAWSVG -e "$DIR1_5X/wait-$i.png" > /dev/null
inkscape -i wait-$i -w 48 -h 48 -f $RAWSVG -e "$DIR1_5X/wait-$i.png" > /dev/null
fi
if [ "$DIR2X/wait-$i.png" -ot $RAWSVG ] ; then
inkscape -i wait-$i -d 180 -f $RAWSVG -e "$DIR2X/wait-$i.png" > /dev/null
inkscape -i wait-$i -w 64 -h 64 -f $RAWSVG -e "$DIR2X/wait-$i.png" > /dev/null
fi
done
echo -e "\033[0KGenerating animated cursor pixmaps... DONE"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment