Alexandre Julliard : comctl32: Specify cursor hotspots separately for each size.

Alexandre Julliard julliard at winehq.org
Tue Oct 17 15:12:10 CDT 2017


Module: wine
Branch: master
Commit: 4d577f9662c9de5207ff944736fa4e0eb84f2675
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4d577f9662c9de5207ff944736fa4e0eb84f2675

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Oct 17 16:26:26 2017 +0200

comctl32: Specify cursor hotspots separately for each size.

This is supported in icoutils as of version 0.32.0.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/idc_copy.svg        |  28 +++++++++++++++++++++-------
 dlls/comctl32/idc_divider.cur     | Bin 33134 -> 33134 bytes
 dlls/comctl32/idc_divider.svg     |  28 +++++++++++++++++++++-------
 dlls/comctl32/idc_divideropen.svg |  28 +++++++++++++++++++++-------
 dlls/comctl32/idc_movebutton.svg  |  28 +++++++++++++++++++++-------
 5 files changed, 84 insertions(+), 28 deletions(-)

diff --git a/dlls/comctl32/idc_copy.svg b/dlls/comctl32/idc_copy.svg
index 70a21ac..6bd0de6 100644
--- a/dlls/comctl32/idc_copy.svg
+++ b/dlls/comctl32/idc_copy.svg
@@ -51,6 +51,27 @@
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
   <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
      id="cursor:64-32"
      height="64"
      width="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="0"
-     x="0"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g6054"
diff --git a/dlls/comctl32/idc_divider.cur b/dlls/comctl32/idc_divider.cur
index 9627a9d..0ec6178 100644
Binary files a/dlls/comctl32/idc_divider.cur and b/dlls/comctl32/idc_divider.cur differ
diff --git a/dlls/comctl32/idc_divider.svg b/dlls/comctl32/idc_divider.svg
index 337c0f2..6c12913 100644
--- a/dlls/comctl32/idc_divider.svg
+++ b/dlls/comctl32/idc_divider.svg
@@ -51,6 +51,27 @@
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
   <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="18"
+     x="20"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="14"
+     x="15"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="9"
+     x="10"
+     style="fill:none" />
+  <rect
      id="cursor:64-32"
      height="64"
      width="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="9"
-     x="10"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g8966"
diff --git a/dlls/comctl32/idc_divideropen.svg b/dlls/comctl32/idc_divideropen.svg
index cdf13a5..3046974 100644
--- a/dlls/comctl32/idc_divideropen.svg
+++ b/dlls/comctl32/idc_divideropen.svg
@@ -51,6 +51,27 @@
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
   <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="18"
+     x="26"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="13"
+     x="19"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="9"
+     x="13"
+     style="fill:none" />
+  <rect
      id="cursor:64-32"
      height="64"
      width="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="9"
-     x="13"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g8966"
diff --git a/dlls/comctl32/idc_movebutton.svg b/dlls/comctl32/idc_movebutton.svg
index acd23d6..91cf866 100644
--- a/dlls/comctl32/idc_movebutton.svg
+++ b/dlls/comctl32/idc_movebutton.svg
@@ -51,6 +51,27 @@
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
   <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="20"
+     x="28"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="15"
+     x="21"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="10"
+     x="14"
+     style="fill:none" />
+  <rect
      id="cursor:64-32"
      height="64"
      width="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="10"
-     x="14"
-     style="fill:none" />
   <g
      id="g6096"
      transform="matrix(1.704871,0,0,1.7043829,-121.23079,-1354.1285)"




More information about the wine-cvs mailing list