git.iko.soy/unity8
on xenial help sign in
Use Icon rather than Image
b828912Dalton Durst
qml/Launcher/LauncherPanel.qml+9−4
compare with xenial
unifiedsplit
@@ -91,16 +91,21 @@ Rectangle {
91 color: UbuntuColors.orange
91 color: UbuntuColors.orange
92 readonly property bool highlighted: root.highlightIndex == -1;
92 readonly property bool highlighted: root.highlightIndex == -1;
93
93
94− Image {
94+ Icon {
95 objectName: "dashItem"
95 objectName: "dashItem"
96 width: parent.width * .6
96 width: parent.width * .6
97 height: width
97 height: width
98− sourceSize.width: width
99− sourceSize.height: height
100 anchors.centerIn: parent
98 anchors.centerIn: parent
99+ source: {
101− source: root.showCloseIcon ? "graphics/back.svg": "graphics/home.svg"
100+ if (root.showCloseIcon) {
101+ return "/usr/share/icons/suru/actions/scalable/back.svg"
102+ }
103+ return "graphics/home.svg"
104+ }
105+ color: "white"
102 rotation: root.rotation
106 rotation: root.rotation
103 }
107 }
108+
104 AbstractButton {
109 AbstractButton {
105 id: dashItem
110 id: dashItem
106 anchors.fill: parent
111 anchors.fill: parent
qml/Launcher/graphics/back.svgdeleted−197
@@ -1,197 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2−<!-- Created with Inkscape (http://www.inkscape.org/) -->
3−
4−<svg
5− xmlns:dc="http://purl.org/dc/elements/1.1/"
6− xmlns:cc="http://creativecommons.org/ns#"
7− xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8− xmlns:svg="http://www.w3.org/2000/svg"
9− xmlns="http://www.w3.org/2000/svg"
10− xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11− xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12− width="96"
13− height="96"
14− id="svg4874"
15− version="1.1"
16− inkscape:version="0.92.3 (2405546, 2018-03-11)"
17− viewBox="0 0 96 96.000001"
18− sodipodi:docname="back.svg">
19− <defs
20− id="defs4876">
21− <clipPath
22− clipPathUnits="userSpaceOnUse"
23− id="clipPath16">
24− <path
25− d="m 0,595.28 841.89,0 L 841.89,0 0,0 0,595.28 Z"
26− id="path18"
27− inkscape:connector-curvature="0" />
28− </clipPath>
29− </defs>
30− <sodipodi:namedview
31− id="base"
32− pagecolor="#ffffff"
33− bordercolor="#666666"
34− borderopacity="1.0"
35− inkscape:pageopacity="0.0"
36− inkscape:pageshadow="2"
37− inkscape:zoom="10.685496"
38− inkscape:cx="50.995361"
39− inkscape:cy="57.096039"
40− inkscape:document-units="px"
41− inkscape:current-layer="layer1"
42− showgrid="true"
43− showborder="true"
44− fit-margin-top="0"
45− fit-margin-left="0"
46− fit-margin-right="0"
47− fit-margin-bottom="0"
48− inkscape:snap-bbox="true"
49− inkscape:bbox-paths="true"
50− inkscape:bbox-nodes="true"
51− inkscape:snap-bbox-edge-midpoints="true"
52− inkscape:snap-bbox-midpoints="true"
53− inkscape:object-paths="true"
54− inkscape:snap-intersection-paths="true"
55− inkscape:object-nodes="true"
56− inkscape:snap-smooth-nodes="true"
57− inkscape:snap-midpoints="true"
58− inkscape:snap-object-midpoints="true"
59− inkscape:snap-center="true"
60− showguides="true"
61− inkscape:guide-bbox="true"
62− inkscape:snap-global="true"
63− inkscape:window-width="1920"
64− inkscape:window-height="1012"
65− inkscape:window-x="0"
66− inkscape:window-y="32"
67− inkscape:window-maximized="1">
68− <inkscape:grid
69− type="xygrid"
70− id="grid5451"
71− empspacing="8" />
72− <sodipodi:guide
73− orientation="1,0"
74− position="8,-8.0000001"
75− id="guide4063"
76− inkscape:locked="false" />
77− <sodipodi:guide
78− orientation="1,0"
79− position="4,-8.0000001"
80− id="guide4065"
81− inkscape:locked="false" />
82− <sodipodi:guide
83− orientation="0,1"
84− position="-8,88.000001"
85− id="guide4067"
86− inkscape:locked="false" />
87− <sodipodi:guide
88− orientation="0,1"
89− position="-8,92.000001"
90− id="guide4069"
91− inkscape:locked="false" />
92− <sodipodi:guide
93− orientation="0,1"
94− position="104,4"
95− id="guide4071"
96− inkscape:locked="false" />
97− <sodipodi:guide
98− orientation="0,1"
99− position="-5,8.0000001"
100− id="guide4073"
101− inkscape:locked="false" />
102− <sodipodi:guide
103− orientation="1,0"
104− position="88,-8.0000001"
105− id="guide4077"
106− inkscape:locked="false" />
107− <sodipodi:guide
108− orientation="0,1"
109− position="-8,84.000001"
110− id="guide4074"
111− inkscape:locked="false" />
112− <sodipodi:guide
113− orientation="1,0"
114− position="12,-8.0000001"
115− id="guide4076"
116− inkscape:locked="false" />
117− <sodipodi:guide
118− orientation="1,0"
119− position="84,-8.0000001"
120− id="guide4080"
121− inkscape:locked="false" />
122− <sodipodi:guide
123− position="48,-8.0000001"
124− orientation="1,0"
125− id="guide4170"
126− inkscape:locked="false" />
127− <sodipodi:guide
128− position="-8,48"
129− orientation="0,1"
130− id="guide4172"
131− inkscape:locked="false" />
132− <sodipodi:guide
133− position="92,-8.0000001"
134− orientation="1,0"
135− id="guide4760"
136− inkscape:locked="false" />
137− <sodipodi:guide
138− position="104,12"
139− orientation="0,1"
140− id="guide4207"
141− inkscape:locked="false" />
142− </sodipodi:namedview>
143− <metadata
144− id="metadata4879">
145− <rdf:RDF>
146− <cc:Work
147− rdf:about="">
148− <dc:format>image/svg+xml</dc:format>
149− <dc:type
150− rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
151− <dc:title />
152− </cc:Work>
153− </rdf:RDF>
154− </metadata>
155− <g
156− inkscape:label="Layer 1"
157− inkscape:groupmode="layer"
158− id="layer1"
159− transform="translate(67.857146,-78.50504)">
160− <g
161− inkscape:label="Layer 1"
162− id="layer1-695"
163− transform="translate(-2.8652345e-6,-1.4294891e-5)">
164− <g
165− transform="matrix(0,-1,-1,0,373.50506,516.50504)"
166− id="g4845-27"
167− style="display:inline">
168− <g
169− inkscape:export-ydpi="90"
170− inkscape:export-xdpi="90"
171− inkscape:export-filename="next01.png"
172− transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
173− id="g4778-56"
174− inkscape:label="Layer 1">
175− <g
176− transform="matrix(-1,0,0,1,575.99999,611)"
177− id="g4780-75"
178− style="display:inline">
179− <path
180− style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1"
181− d="m 437.00209,379.49587 c -5.24691,4.1449 -10.54573,8.128 -15.94494,11.7914 -6.00476,4.0757 -11.8322,7.7257 -17.4773,10.9536 -5.20923,2.9783 -9.64507,5.2206 -13.59532,7.0003 -3.95086,-1.7798 -8.3889,-4.0213 -13.59947,-7.0003 -5.64495,-3.2278 -11.47152,-6.8778 -17.47731,-10.9536 -5.39821,-3.6627 -10.69595,-7.6466 -15.94285,-11.7914 h 7.93911 c 3.15098,2.4002 6.38063,4.7681 9.75501,7.0752 4.26477,2.9172 8.6291,5.6557 13.09079,8.2194 4.52823,2.6011 10.75085,5.7064 15.00884,7.7151 h 0.002 l 1.22173,0.5752 1.22172,-0.5752 h 0.002 c 4.25899,-2.0087 10.48126,-5.1138 15.00884,-7.7151 4.46175,-2.5637 8.82538,-5.3023 13.09078,-8.2194 3.37342,-2.307 6.60393,-4.6749 9.75502,-7.0752 h 7.9412 z"
182− id="path4265-0-4"
183− inkscape:connector-curvature="0" />
184− <rect
185− style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
186− id="rect4782-01"
187− width="96.037987"
188− height="96"
189− x="-438.00244"
190− y="345.36221"
191− transform="scale(-1,1)" />
192− </g>
193− </g>
194− </g>
195− </g>
196− </g>
197−</svg>