fix crash when app icon is null

Change-Id: Ibf4b7cdddb0c4995f312b121082e4b2cbfd149d2
Verified+1: Anonymous Coward #1000004 Code-Review+2: 石博文 <sbw@sbw.so> Submitted-by: 石博文 <sbw@sbw.so> Submitted-at: Mon, 22 Aug 2016 07:02:32 +0000 Reviewed-on: https://cr.deepin.io/15411 Project: dde/dde-dock Branch: refs/heads/master
2025-06-04 09:23:03 +00:00 · 2016-08-22 11:08:42 +08:00 · 2016-08-22 11:08:42 +08:00 · aa916fda66 · 2016-08-22 07:02:32 +00:00
commit aa916fda66
parent 21d3d7ddf1
3 changed files with 86 additions and 1 deletions
--- a/frame/item/resources.qrc
+++ b/frame/item/resources.qrc
@ -10,5 +10,6 @@
        <file>resources/arrow-right.svg</file>
        <file>resources/arrow-left.svg</file>
        <file>resources/arrow-down.svg</file>
+        <file>resources/application-x-desktop.svg</file>
    </qresource>
 </RCC>
--- a/frame/item/resources/application-x-desktop.svg
+++ b/frame/item/resources/application-x-desktop.svg
@ -0,0 +1,84 @@
+<?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:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 48 48"
+   id="图层_1"
+   xml:space="preserve"><metadata
+     id="metadata41"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs39" /><g
+     id="g3"
+     style="opacity:0.6;display:none"><rect
+       width="48"
+       height="48"
+       x="-0.0020000001"
+       y="-0.0049999999"
+       id="rect5"
+       style="opacity:0.4;display:inline" /></g><g
+     id="g7"><image
+       xlink:href="data:image/png;base64,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"
+       width="184"
+       height="184"
+       transform="matrix(0.24,0,0,0.24,1.9893,2.995)"
+       id="image9"
+       style="opacity:0.3;overflow:visible" /><g
+       id="g11"><g
+         id="g13"><linearGradient
+           x1="23.9893"
+           y1="4.9949999"
+           x2="23.9893"
+           y2="42.994999"
+           id="SVGID_1_"
+           gradientUnits="userSpaceOnUse"><stop
+             id="stop16"
+             style="stop-color:#2689f8;stop-opacity:1"
+             offset="0" /><stop
+             id="stop18"
+             style="stop-color:#258df5;stop-opacity:1"
+             offset="1" /></linearGradient><path
+           d="m 42.989,41.995 c 0,0.552 -0.448,1 -1,1 h -36 c -0.552,0 -1,-0.448 -1,-1 v -36 c 0,-0.552 0.448,-1 1,-1 h 36 c 0.552,0 1,0.448 1,1 v 36 z"
+           inkscape:connector-curvature="0"
+           id="path20"
+           style="fill:url(#SVGID_1_)" /><g
+           id="g22"><path
+             d="M 22.254,38.684 21.57,36.755 C 21.237,35.816 20.521,35.06 19.606,34.679 L 19.529,34.65 c -0.406,-0.158 -0.834,-0.238 -1.271,-0.238 -0.521,0 -1.043,0.118 -1.513,0.342 l -1.843,0.877 -2.469,-2.475 0.878,-1.849 c 0.427,-0.9 0.453,-1.944 0.072,-2.865 -0.38,-0.918 -1.134,-1.636 -2.07,-1.971 L 9.389,25.784 v -3.5 l 1.924,-0.686 c 0.936,-0.336 1.689,-1.054 2.07,-1.971 0.38,-0.92 0.354,-1.965 -0.072,-2.866 l -0.878,-1.85 2.469,-2.474 1.843,0.877 c 0.471,0.224 0.993,0.342 1.513,0.342 0.438,0 0.865,-0.08 1.271,-0.239 l 0.077,-0.029 c 0.915,-0.381 1.631,-1.137 1.964,-2.075 l 0.684,-1.93 h 3.49 l 0.685,1.93 c 0.332,0.937 1.048,1.692 1.966,2.074 0.429,0.18 0.883,0.27 1.348,0.27 0.52,0 1.043,-0.118 1.513,-0.342 l 1.843,-0.877 2.468,2.474 -0.878,1.849 c -0.426,0.899 -0.451,1.944 -0.071,2.865 0.379,0.917 1.133,1.636 2.068,1.973 l 1.926,0.686 v 3.5 l -1.924,0.686 c -0.938,0.337 -1.692,1.056 -2.071,1.972 -0.379,0.923 -0.353,1.967 0.072,2.864 l 0.878,1.85 -2.468,2.475 -1.857,-0.884 c -0.465,-0.222 -0.982,-0.34 -1.498,-0.34 -0.461,0 -0.911,0.091 -1.337,0.269 -0.923,0.385 -1.645,1.147 -1.982,2.094 l -0.679,1.915 h -3.492 z"
+             inkscape:connector-curvature="0"
+             id="path24"
+             style="fill:#79bbf6" /><path
+             d="m 25.468,9.775 0.592,1.67 c 0.369,1.04 1.164,1.88 2.183,2.304 l 0.145,0.06 h 0.009 c 0.431,0.159 0.882,0.239 1.344,0.239 0.577,0 1.159,-0.131 1.681,-0.38 l 1.593,-0.759 2.079,2.085 -0.76,1.602 c -0.449,0.95 -0.497,2.045 -0.138,3.028 v 0.01 l 0.059,0.143 c 0.421,1.018 1.258,1.815 2.298,2.189 l 1.666,0.594 v 2.949 l -1.666,0.594 c -1.039,0.373 -1.877,1.17 -2.299,2.189 l -0.059,0.145 v 0.01 c -0.358,0.983 -0.31,2.077 0.14,3.026 l 0.76,1.602 -2.079,2.085 -1.607,-0.765 c -0.517,-0.247 -1.093,-0.377 -1.666,-0.377 -0.513,0 -1.013,0.1 -1.489,0.298 -1.023,0.428 -1.824,1.274 -2.198,2.324 l -0.587,1.655 H 22.53 l -0.591,-1.67 c -0.37,-1.042 -1.166,-1.882 -2.182,-2.305 l -0.146,-0.06 h -0.009 c -0.431,-0.159 -0.882,-0.239 -1.344,-0.239 -0.577,0 -1.158,0.131 -1.68,0.38 l -1.593,0.759 -2.08,-2.085 0.759,-1.601 c 0.451,-0.95 0.499,-2.045 0.14,-3.029 v -0.011 l -0.06,-0.143 C 13.321,27.272 12.483,26.475 11.445,26.104 L 9.78,25.509 v -2.95 l 1.666,-0.594 c 1.038,-0.372 1.875,-1.17 2.298,-2.188 l 0.06,-0.145 v -0.01 c 0.359,-0.983 0.31,-2.077 -0.14,-3.029 l -0.759,-1.601 2.08,-2.085 1.594,0.759 c 0.522,0.248 1.103,0.379 1.679,0.379 0.461,0 0.913,-0.08 1.344,-0.239 h 0.011 l 0.144,-0.06 c 1.017,-0.423 1.812,-1.263 2.182,-2.305 L 22.53,9.772 h 2.938 m 0.551,-0.777 h -4.041 l -0.775,2.188 c -0.297,0.835 -0.931,1.506 -1.747,1.846 h -0.002 c -0.384,0.16 -0.79,0.239 -1.197,0.239 -0.46,0 -0.92,-0.102 -1.345,-0.304 l -2.091,-0.996 -2.858,2.864 0.995,2.097 c 0.38,0.803 0.404,1.728 0.065,2.549 v 10e-4 c -0.339,0.818 -1.008,1.454 -1.841,1.753 L 9,22.01 v 4.049 l 2.183,0.78 c 0.833,0.297 1.502,0.934 1.841,1.751 v 0.001 c 0.339,0.821 0.316,1.747 -0.065,2.549 l -0.995,2.097 2.858,2.864 2.091,-0.996 c 0.424,-0.202 0.884,-0.304 1.344,-0.304 0.407,0 0.813,0.079 1.197,0.239 h 0.002 c 0.815,0.339 1.45,1.011 1.747,1.846 l 0.775,2.188 h 4.041 L 26.79,36.9 c 0.3,-0.843 0.941,-1.521 1.764,-1.865 0.381,-0.159 0.785,-0.238 1.188,-0.238 0.455,0 0.91,0.101 1.33,0.301 l 2.106,1.002 2.856,-2.864 -0.995,-2.098 c -0.38,-0.802 -0.403,-1.727 -0.065,-2.547 V 28.59 c 0.339,-0.819 1.01,-1.455 1.842,-1.754 L 39,26.059 V 22.01 l -2.184,-0.778 c -0.831,-0.299 -1.501,-0.935 -1.84,-1.753 v -10e-4 c -0.339,-0.821 -0.316,-1.747 0.063,-2.549 l 0.995,-2.097 -2.856,-2.864 -2.091,0.996 c -0.425,0.202 -0.885,0.304 -1.346,0.304 -0.407,0 -0.814,-0.079 -1.197,-0.239 h -0.001 c -0.816,-0.34 -1.452,-1.01 -1.748,-1.846 l -0.776,-2.188 0,0 z"
+             inkscape:connector-curvature="0"
+             id="path26"
+             style="fill:#ffffff" /></g><linearGradient
+           x1="23.999701"
+           y1="14.3678"
+           x2="23.999701"
+           y2="33.779598"
+           id="SVGID_2_"
+           gradientUnits="userSpaceOnUse"><stop
+             id="stop29"
+             style="stop-color:#2786f4;stop-opacity:1"
+             offset="0" /><stop
+             id="stop31"
+             style="stop-color:#268bf0;stop-opacity:1"
+             offset="1" /></linearGradient><circle
+           cx="24"
+           cy="24.073999"
+           r="9.7060003"
+           id="circle33"
+           style="fill:url(#SVGID_2_)" /><path
+           d="m 24,15.338 c -4.824,0 -8.735,3.911 -8.735,8.735 0,4.824 3.911,8.735 8.735,8.735 4.825,0 8.735,-3.911 8.735,-8.735 0,-4.824 -3.911,-8.735 -8.735,-8.735 z m 0,16.812 c -0.527,0 -1.042,-0.051 -1.541,-0.147 2.094,-0.587 4.584,-2.035 5.766,-4.362 0,0 2.426,-3.974 -1.679,-7.551 0,0 1.056,1.659 1.088,3.329 0,0 0.25,2.196 -1.692,3.567 -2.863,2.022 -7.325,1.111 -9.224,0.586 -0.51,-1.058 -0.795,-2.245 -0.795,-3.498 0,-1.876 0.64,-3.602 1.713,-4.973 0.53,2.556 1.624,4.691 2.359,5.482 0.981,1.056 2.424,2.177 4.278,1.713 1.853,-0.463 2.23,-2.489 2.23,-2.489 0.41,-1.724 -0.173,-3.771 -0.205,-3.814 -0.032,-0.043 -0.31,-0.092 -0.31,-0.092 0.291,2.715 -0.423,3.916 -0.423,3.916 -1.039,2.128 -2.564,1.471 -2.564,1.471 -1.696,-0.865 -1.616,-3.302 -1.616,-3.302 -0.05,-1.633 0.572,-4.294 1.773,-5.945 0.277,-0.029 0.557,-0.043 0.842,-0.043 1.081,0 2.113,0.213 3.055,0.599 -1.001,0.841 -2.545,2.416 -2.545,2.416 -2.5,2.317 -2.015,4.267 -2.015,4.267 0.399,2.047 1.638,0.668 1.638,0.668 1.303,-1.347 1.206,-4.03 1.206,-4.03 -0.528,0.086 -0.862,0.377 -0.862,0.377 -0.065,1.788 -1.121,2.898 -1.121,2.898 -0.409,0.453 -0.7,0.022 -0.7,0.022 -0.215,-0.323 0.215,-0.55 0.215,-0.55 0.603,-0.528 0.784,-1.429 0.776,-1.767 -0.009,-0.339 0.172,-0.431 0.172,-0.431 0.851,-0.657 1.703,-1.045 1.703,-1.045 1.142,-0.582 3.178,-0.679 3.178,-0.679 0.482,0.016 0.945,-0.003 1.336,-0.032 1.268,1.426 2.039,3.305 2.039,5.363 10e-4,4.46 -3.615,8.076 -8.075,8.076 z"
+           inkscape:connector-curvature="0"
+           id="path35"
+           style="fill:#ffffff" /></g></g></g></svg>
--- a/frame/util/themeappicon.cpp
+++ b/frame/util/themeappicon.cpp
@ -147,7 +147,7 @@ QPixmap ThemeAppIcon::getIcon(const QString iconName, const int size)
        pixmap = QPixmap(fileName);

    if (pixmap.isNull())
-        return pixmap;
+        pixmap = loadSvg(":/icons/resources/application-x-desktop.svg", size);

    return pixmap.scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }