Skip to content
Permalink
Browse files

Merge pull request #6937 from slarosa/fix_svg_size

fix svg size for cross-hair, capture-point, zoomin and zoomout, fixes #18806
  • Loading branch information
m-kuhn committed May 7, 2018
2 parents b9884c2 + 4749306 commit 3264b0bb3e49fca5d923deae3e8bb0e82662ff5f
@@ -1 +1 @@
<svg height="24" viewBox="0 0 24.000001 24.000001" width="24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -1028.3622)"><path d="m11.999024 1031.2685c-5.0013627 0-9.0917967 4.0922-9.0917967 9.0938 0 5.0016 4.090434 9.0937 9.0917967 9.0937 5.001362 0 9.09375-4.0921 9.09375-9.0937 0-5.0016-4.092388-9.0938-9.09375-9.0938zm.002 1.7481a7.3431287 7.3438616 0 0 1 .732422.037 7.3431287 7.3438616 0 0 1 .724609.1093 7.3431287 7.3438616 0 0 1 .712891.1817 7.3431287 7.3438616 0 0 1 .689453.2519 7.3431287 7.3438616 0 0 1 .660156.3204 7.3431287 7.3438616 0 0 1 .625.3828 7.3431287 7.3438616 0 0 1 .585938.4453 7.3431287 7.3438616 0 0 1 .537109.5 7.3431287 7.3438616 0 0 1 .484375.5508 7.3431287 7.3438616 0 0 1 .425781.5976 7.3431287 7.3438616 0 0 1 .365235.6367 7.3431287 7.3438616 0 0 1 .300781.67 7.3431287 7.3438616 0 0 1 .230469.6972 7.3431287 7.3438616 0 0 1 .160156.7149 7.3431287 7.3438616 0 0 1 .08984.7304 7.3431287 7.3438616 0 0 1 .01758.5196 7.3431287 7.3438616 0 0 1 -.03711.7324 7.3431287 7.3438616 0 0 1 -.109375.7265 7.3431287 7.3438616 0 0 1 -.18164.711 7.3431287 7.3438616 0 0 1 -.251953.6894 7.3431287 7.3438616 0 0 1 -.31836.6602 7.3431287 7.3438616 0 0 1 -.384765.6269 7.3431287 7.3438616 0 0 1 -.44336.584 7.3431287 7.3438616 0 0 1 -.5.5371 7.3431287 7.3438616 0 0 1 -.550781.4844 7.3431287 7.3438616 0 0 1 -.597656.4278 7.3431287 7.3438616 0 0 1 -.636719.3652 7.3431287 7.3438616 0 0 1 -.669922.2988 7.3431287 7.3438616 0 0 1 -.697266.2324 7.3431287 7.3438616 0 0 1 -.714843.1602 7.3431287 7.3438616 0 0 1 -.730469.088 7.3431287 7.3438616 0 0 1 -.517578.019 7.3431287 7.3438616 0 0 1 -.734375-.037 7.3431287 7.3438616 0 0 1 -.724609-.1094 7.3431287 7.3438616 0 0 1 -.7128907-.1816 7.3431287 7.3438616 0 0 1 -.689453-.252 7.3431287 7.3438616 0 0 1 -.660156-.3203 7.3431287 7.3438616 0 0 1 -.625-.3828 7.3431287 7.3438616 0 0 1 -.585938-.4453 7.3431287 7.3438616 0 0 1 -.537109-.5 7.3431287 7.3438616 0 0 1 -.484375-.5508 7.3431287 7.3438616 0 0 1 -.425782-.5976 7.3431287 7.3438616 0 0 1 -.365234-.6368 7.3431287 7.3438616 0 0 1 -.300781-.6699 7.3431287 7.3438616 0 0 1 -.230469-.6972 7.3431287 7.3438616 0 0 1 -.160156-.7149 7.3431287 7.3438616 0 0 1 -.089844-.7285 7.3431287 7.3438616 0 0 1 -.017578-.5195 7.3431287 7.3438616 0 0 1 .037109-.7344 7.3431287 7.3438616 0 0 1 .109375-.7246 7.3431287 7.3438616 0 0 1 .181641-.7129 7.3431287 7.3438616 0 0 1 .251953-.6895 7.3431287 7.3438616 0 0 1 .318359-.6601 7.3431287 7.3438616 0 0 1 .384766-.627 7.3431287 7.3438616 0 0 1 .443359-.584 7.3431287 7.3438616 0 0 1 .5-.5371 7.3431287 7.3438616 0 0 1 .550782-.4843 7.3431287 7.3438616 0 0 1 .597656-.4258 7.3431287 7.3438616 0 0 1 .636719-.3653 7.3431287 7.3438616 0 0 1 .669921-.3007 7.3431287 7.3438616 0 0 1 .6972657-.2305 7.3431287 7.3438616 0 0 1 .714844-.1621 7.3431287 7.3438616 0 0 1 .730469-.088 7.3431287 7.3438616 0 0 1 .519531-.02z" fill="#fff" overflow="visible"/><path d="m7.0000003 1040.3622h10.0000007" fill="none" stroke="#000" stroke-width="1.50000009"/><path d="m12.000001 1035.3621v10.0001" fill="none" stroke="#000" stroke-width="1.50000009"/><ellipse cx="12.000001" cy="1040.3622" fill="#fff" rx="1.499993" ry="1.4999931"/><path d="m11.250001 1030.3622v1.9454c-3.8637771.3575-6.9473551 3.4415-7.3046881 7.3046h-1.945312v1.4981h1.945312c.356486 3.864 3.440264 6.9511 7.3046881 7.3086v1.9433h1.5v-1.9433c3.864427-.3575 6.948205-3.4446 7.304687-7.3086h1.945313v-1.4981h-1.945313c-.35733-3.8631-3.440907-6.9471-7.304687-7.3046v-1.9454zm.75 3.4063c.912362 0 1.781158.1826 2.570312.5156.789154.333 1.499679.816 2.095703 1.4121.596024.5962 1.077184 1.3063 1.410156 2.0957.332973.7894.517579 1.6575.517579 2.5703 0 .9129-.184606 1.7811-.517579 2.5704-.332972.7892-.814132 1.4997-1.410156 2.0957-.596024.5959-1.306549 1.0773-2.095703 1.4101-.789154.3328-1.65795.5176-2.570312.5176-.912362 0-1.781159-.1848-2.5703131-.5176-.789153-.3328-1.497726-.8142-2.09375-1.4101-.596024-.596-1.079137-1.3065-1.412109-2.0957-.332973-.7893-.515625-1.6575-.515625-2.5704 0-.9128.182652-1.7809.515625-2.5703.332972-.7894.816085-1.4995 1.412109-2.0957.596024-.5961 1.304597-1.0791 2.09375-1.4121.7891541-.333 1.6579511-.5156 2.5703131-.5156z" fill-rule="evenodd" overflow="visible"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24.000001 24.000001" width="24"><g transform="matrix(1.2 0 0 1.2 -2.5355937 -1236.2991)"><path d="M11.999024 1031.2685c-5.0013627 0-9.0917967 4.0922-9.0917967 9.0938s4.090434 9.0937 9.0917967 9.0937c5.001362 0 9.09375-4.0921 9.09375-9.0937s-4.092388-9.0938-9.09375-9.0938zm.002 1.7481a7.3431287 7.3438616 0 0 1 .732422.037 7.3431287 7.3438616 0 0 1 .724609.1093 7.3431287 7.3438616 0 0 1 .712891.1817 7.3431287 7.3438616 0 0 1 .689453.2519 7.3431287 7.3438616 0 0 1 .660156.3204 7.3431287 7.3438616 0 0 1 .625.3828 7.3431287 7.3438616 0 0 1 .585938.4453 7.3431287 7.3438616 0 0 1 .537109.5 7.3431287 7.3438616 0 0 1 .484375.5508 7.3431287 7.3438616 0 0 1 .425781.5976 7.3431287 7.3438616 0 0 1 .365235.6367 7.3431287 7.3438616 0 0 1 .300781.67 7.3431287 7.3438616 0 0 1 .230469.6972 7.3431287 7.3438616 0 0 1 .160156.7149 7.3431287 7.3438616 0 0 1 .08984.7304 7.3431287 7.3438616 0 0 1 .01758.5196 7.3431287 7.3438616 0 0 1-.03711.7324 7.3431287 7.3438616 0 0 1-.109375.7265 7.3431287 7.3438616 0 0 1-.18164.711 7.3431287 7.3438616 0 0 1-.251953.6894 7.3431287 7.3438616 0 0 1-.31836.6602 7.3431287 7.3438616 0 0 1-.384765.6269 7.3431287 7.3438616 0 0 1-.44336.584 7.3431287 7.3438616 0 0 1-.5.5371 7.3431287 7.3438616 0 0 1-.550781.4844 7.3431287 7.3438616 0 0 1-.597656.4278 7.3431287 7.3438616 0 0 1-.636719.3652 7.3431287 7.3438616 0 0 1-.669922.2988 7.3431287 7.3438616 0 0 1-.697266.2324 7.3431287 7.3438616 0 0 1-.714843.1602 7.3431287 7.3438616 0 0 1-.730469.088 7.3431287 7.3438616 0 0 1-.517578.019 7.3431287 7.3438616 0 0 1-.734375-.037 7.3431287 7.3438616 0 0 1-.724609-.1094 7.3431287 7.3438616 0 0 1-.7128907-.1816 7.3431287 7.3438616 0 0 1-.689453-.252 7.3431287 7.3438616 0 0 1-.660156-.3203 7.3431287 7.3438616 0 0 1-.625-.3828 7.3431287 7.3438616 0 0 1-.585938-.4453 7.3431287 7.3438616 0 0 1-.537109-.5 7.3431287 7.3438616 0 0 1-.484375-.5508 7.3431287 7.3438616 0 0 1-.425782-.5976 7.3431287 7.3438616 0 0 1-.365234-.6368 7.3431287 7.3438616 0 0 1-.300781-.6699 7.3431287 7.3438616 0 0 1-.230469-.6972 7.3431287 7.3438616 0 0 1-.160156-.7149 7.3431287 7.3438616 0 0 1-.089844-.7285 7.3431287 7.3438616 0 0 1-.017578-.5195 7.3431287 7.3438616 0 0 1 .037109-.7344 7.3431287 7.3438616 0 0 1 .109375-.7246 7.3431287 7.3438616 0 0 1 .181641-.7129 7.3431287 7.3438616 0 0 1 .251953-.6895 7.3431287 7.3438616 0 0 1 .318359-.6601 7.3431287 7.3438616 0 0 1 .384766-.627 7.3431287 7.3438616 0 0 1 .443359-.584 7.3431287 7.3438616 0 0 1 .5-.5371 7.3431287 7.3438616 0 0 1 .550782-.4843 7.3431287 7.3438616 0 0 1 .597656-.4258 7.3431287 7.3438616 0 0 1 .636719-.3653 7.3431287 7.3438616 0 0 1 .669921-.3007 7.3431287 7.3438616 0 0 1 .6972657-.2305 7.3431287 7.3438616 0 0 1 .714844-.1621 7.3431287 7.3438616 0 0 1 .730469-.088 7.3431287 7.3438616 0 0 1 .519531-.02z" overflow="visible" fill="#fff"/><path d="M7.0000003 1040.3622H17.000001M12.000001 1035.3621v10.0001" fill="none" stroke="#000" stroke-width="1.50000012"/><ellipse cx="12.000001" cy="1040.3622" rx="1.499993" ry="1.4999931" fill="#fff"/><path d="M11.250001 1030.3622v1.9454c-3.8637771.3575-6.9473551 3.4415-7.3046881 7.3046h-1.945312v1.4981h1.945312c.356486 3.864 3.440264 6.9511 7.3046881 7.3086v1.9433h1.5v-1.9433c3.864427-.3575 6.948205-3.4446 7.304687-7.3086h1.945313v-1.4981h-1.945313c-.35733-3.8631-3.440907-6.9471-7.304687-7.3046v-1.9454zm.75 3.4063c.912362 0 1.781158.1826 2.570312.5156.789154.333 1.499679.816 2.095703 1.4121.596024.5962 1.077184 1.3063 1.410156 2.0957.332973.7894.517579 1.6575.517579 2.5703 0 .9129-.184606 1.7811-.517579 2.5704-.332972.7892-.814132 1.4997-1.410156 2.0957-.596024.5959-1.306549 1.0773-2.095703 1.4101-.789154.3328-1.65795.5176-2.570312.5176-.912362 0-1.781159-.1848-2.5703131-.5176-.789153-.3328-1.497726-.8142-2.09375-1.4101-.596024-.596-1.079137-1.3065-1.412109-2.0957-.332973-.7893-.515625-1.6575-.515625-2.5704 0-.9128.182652-1.7809.515625-2.5703.332972-.7894.816085-1.4995 1.412109-2.0957.596024-.5961 1.304597-1.0791 2.09375-1.4121.7891541-.333 1.6579511-.5156 2.5703131-.5156z" overflow="visible" fill-rule="evenodd"/></g></svg>
@@ -1 +1 @@
<svg height="24" viewBox="0 0 24.000001 24.000001" width="24" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(0 -1028.3622)"><path d="m2.0000001 1040.3622h7.0075899m5.994795 0h6.997617" stroke="#fff" stroke-width="4.00000024"/><path d="m2.0000001 1040.3622h7.0075899m5.994795 0h6.997617" stroke="#000" stroke-width="2.00000012"/><path d="m12.000001 1050.3622v-7.0076m0-5.9948v-6.9976" stroke="#fff" stroke-width="4.00000048"/><path d="m12.000001 1050.3622v-7.0076m0-5.9948v-6.9976" stroke="#000" stroke-width="2.00000024"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24.000001 24.000001" width="24"><g fill="none"><path d="M2.0000001 1040.3622H9.00759m5.994795 0h6.997617" stroke="#fff" stroke-width="4.00000048" transform="matrix(1.2 0 0 1.2 -2.2305079 -1236.4008)"/><path d="M2.0000001 1040.3622H9.00759m5.994795 0h6.997617" stroke="#000" stroke-width="2.00000024" transform="matrix(1.2 0 0 1.2 -2.2305079 -1236.4008)"/><path d="M12.000001 1050.3622v-7.0076m0-5.9948v-6.9976" stroke="#fff" stroke-width="4.00000048" transform="matrix(1.2 0 0 1.2 -2.2305079 -1236.4008)"/><path d="M12.000001 1050.3622v-7.0076m0-5.9948v-6.9976" stroke="#000" stroke-width="2.00000024" transform="matrix(1.2 0 0 1.2 -2.2305079 -1236.4008)"/></g></svg>
@@ -1 +1 @@
<svg height="24" viewBox="0 0 24.000001 24.000001" width="24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.9565239 0 0 .95545692 .65024315 -981.790403)"><path d="m15.139163 1041.2225c-.392993 1.7467-2.217698 2.2202-2.217698 2.2202l7.392464 7.4007 2.217697-2.2201z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linejoin="round" stroke-width="1.56905377"/><path d="m1.1597145 1037.5041c0 4.4746 3.6230358 8.1021 8.0922782 8.1021 4.4692413 0 8.0922783-3.6275 8.0922783-8.1021 0-4.4747-3.623037-8.1023-8.0922783-8.1023-4.4692424 0-8.0922782 3.6276-8.0922782 8.1023z" style="fill:#fff;stroke:#000;stroke-width:1.56905373;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:7"/><g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.9000001" transform="translate(.1018275 .3826)"><path d="m9.1501655 1032.8214v8.6" overflow="visible"/><path d="m13.450165 1037.1214h-8.5999995" overflow="visible"/></g><path d="m18.377087 1044.1893l-2-2-2.000001 2 2.000001 2z" fill-rule="evenodd"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24.000001 24.000001" width="24"><path d="M15.139163 1041.2225c-.392993 1.7467-2.217698 2.2202-2.217698 2.2202l7.392464 7.4007 2.217697-2.2201z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width="1.56905377" stroke-linejoin="round" transform="matrix(1.04595 0 0 1.0464 -.49952522 -1076.3057)"/><path d="M1.1597145 1037.5041c0 4.4746 3.6230358 8.1021 8.0922782 8.1021 4.4692413 0 8.0922783-3.6275 8.0922783-8.1021 0-4.4747-3.623037-8.1023-8.0922783-8.1023-4.4692424 0-8.0922782 3.6276-8.0922782 8.1023z" fill="#fff" stroke="#000" stroke-width="1.56905377" stroke-linecap="round" stroke-linejoin="round" stroke-dashoffset="7" transform="matrix(1.04595 0 0 1.0464 -.49952522 -1076.3057)"/><g fill="none" stroke="#000" stroke-width="2.9000001" stroke-linecap="round" stroke-linejoin="round"><path d="M9.1501655 1032.8214v8.6M13.450165 1037.1214H4.8501655" overflow="visible" transform="matrix(1.04595 0 0 1.0464 -.39301842 -1075.90534813)"/></g><path d="M18.72204773 16.33189514l-2.0919064-2.092796-2.09190744 2.092796 2.09190744 2.092796z" fill-rule="evenodd"/></svg>
@@ -1 +1 @@
<svg height="24" viewBox="0 0 24.000001 24.000001" width="24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.9565239 0 0 .95545692 .65024315 -981.790403)"><path d="m15.139163 1041.2225c-.392993 1.7467-2.217698 2.2202-2.217698 2.2202l7.392464 7.4007 2.217697-2.2201z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linejoin="round" stroke-width="1.56905377"/><path d="m1.1597145 1037.5041c0 4.4746 3.6230358 8.1021 8.0922782 8.1021 4.4692413 0 8.0922783-3.6275 8.0922783-8.1021 0-4.4747-3.623037-8.1023-8.0922783-8.1023-4.4692424 0-8.0922782 3.6276-8.0922782 8.1023z" style="fill:#fff;stroke:#000;stroke-width:1.56905373;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:7"/><path d="m13.551993 1037.504h-8.6" style="overflow:visible;fill:none;stroke:#000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round"/><path d="m18.377087 1044.1893l-2-2-2.000001 2 2.000001 2z" fill-rule="evenodd"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24.000001 24.000001" width="24"><path d="M15.139163 1041.2225c-.392993 1.7467-2.217698 2.2202-2.217698 2.2202l7.392464 7.4007 2.217697-2.2201z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width="1.56905377" stroke-linejoin="round" transform="matrix(1.04616 0 0 1.043 -.2976219 -1072.8416)"/><path d="M1.1597145 1037.5041c0 4.4746 3.6230358 8.1021 8.0922782 8.1021 4.4692413 0 8.0922783-3.6275 8.0922783-8.1021 0-4.4747-3.623037-8.1023-8.0922783-8.1023-4.4692424 0-8.0922782 3.6276-8.0922782 8.1023z" fill="#fff" stroke="#000" stroke-width="1.56905377" stroke-linecap="round" stroke-linejoin="round" stroke-dashoffset="7" transform="matrix(1.04616 0 0 1.043 -.2976219 -1072.8416)"/><path d="M13.551993 1037.504h-8.6" overflow="visible" fill="none" stroke="#000" stroke-width="2.9000001" stroke-linecap="round" stroke-linejoin="round" transform="matrix(1.04616 0 0 1.043 -.2976219 -1072.8416)"/><path d="M18.92767058 16.25410504l-2.0923112-2.086012-2.09231225 2.086012 2.09231225 2.086012z" fill-rule="evenodd"/></svg>
@@ -572,7 +572,7 @@ QCursor QgsApplication::getThemeCursor( Cursor cursor )
if ( app->devicePixelRatio() >= 2 )
{
scale *= app->devicePixelRatio();
activeX = activeY = 5;
activeX = activeY = 8;
}
#endif
cursorIcon = QCursor( icon.pixmap( std::ceil( scale * 32 ), std::ceil( scale * 32 ) ), std::ceil( scale * activeX ), std::ceil( scale * activeY ) );

0 comments on commit 3264b0b

Please sign in to comment.
You can’t perform that action at this time.