From 56828b82d9fd6f92015e10cd581c3f04cf6a9488 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sat, 4 Nov 2023 22:15:43 +0900 Subject: [PATCH] [MSPAINT] Distinguish between icons and cursors (#5884) - Convert icons/*_cur.ico to the cursor files (*.cur). - The hot spot is (16, 16) (default). - Rename icons/ folder as img/. - Use LoadCursorW instead of LoadIconW for cursors. - Use CURSOR statements for cursor files instead of ICON statements in rsrc.rc. - I used GIMP to convert the icon files to the PNG files. - I used RealWorld Cursor Editor to convert the PNG files to the cursor files. CORE-19297 --- base/applications/mspaint/CMakeLists.txt | 2 +- base/applications/mspaint/canvas.cpp | 10 +++---- .../mspaint/icons/airbrush_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/color_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/fill_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/pen_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/zoom_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/img/airbrush.cur | Bin 0 -> 766 bytes base/applications/mspaint/img/color.cur | Bin 0 -> 766 bytes base/applications/mspaint/img/fill.cur | Bin 0 -> 766 bytes .../mspaint/{icons => img}/fontstoolbar.bmp | Bin .../mspaint/{icons => img}/handdrag.cur | Bin .../mspaint/{icons => img}/horzskew.ico | Bin .../mspaint/{icons => img}/horzstretch.ico | Bin .../mspaint/{icons => img}/iconbar.bmp | Bin .../mspaint/{icons => img}/nontransparent.ico | Bin .../mspaint/{icons => img}/paint.ico | Bin .../mspaint/{icons => img}/paint.svg | 0 base/applications/mspaint/img/pen.cur | Bin 0 -> 766 bytes .../mspaint/{icons => img}/transparency.xcf | Bin .../mspaint/{icons => img}/transparent.ico | Bin .../mspaint/{icons => img}/vertskew.ico | Bin .../mspaint/{icons => img}/vertstretch.ico | Bin base/applications/mspaint/img/zoom.cur | Bin 0 -> 766 bytes base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/de-DE.rc | 2 +- base/applications/mspaint/lang/en-GB.rc | 2 +- base/applications/mspaint/lang/en-US.rc | 2 +- base/applications/mspaint/lang/es-ES.rc | 2 +- base/applications/mspaint/lang/et-EE.rc | 2 +- base/applications/mspaint/lang/eu-ES.rc | 2 +- base/applications/mspaint/lang/fr-FR.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/hu-HU.rc | 2 +- base/applications/mspaint/lang/id-ID.rc | 2 +- base/applications/mspaint/lang/it-IT.rc | 2 +- base/applications/mspaint/lang/ja-JP.rc | 2 +- base/applications/mspaint/lang/nl-NL.rc | 2 +- base/applications/mspaint/lang/no-NO.rc | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 2 +- base/applications/mspaint/lang/pt-PT.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 2 +- base/applications/mspaint/lang/sk-SK.rc | 2 +- base/applications/mspaint/lang/sq-AL.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/tr-TR.rc | 2 +- base/applications/mspaint/lang/uk-UA.rc | 2 +- base/applications/mspaint/lang/vi-VN.rc | 2 +- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-HK.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- base/applications/mspaint/rsrc.rc | 28 +++++++++--------- 55 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 base/applications/mspaint/icons/airbrush_cur.ico delete mode 100644 base/applications/mspaint/icons/color_cur.ico delete mode 100644 base/applications/mspaint/icons/fill_cur.ico delete mode 100644 base/applications/mspaint/icons/pen_cur.ico delete mode 100644 base/applications/mspaint/icons/zoom_cur.ico create mode 100644 base/applications/mspaint/img/airbrush.cur create mode 100644 base/applications/mspaint/img/color.cur create mode 100644 base/applications/mspaint/img/fill.cur rename base/applications/mspaint/{icons => img}/fontstoolbar.bmp (100%) rename base/applications/mspaint/{icons => img}/handdrag.cur (100%) rename base/applications/mspaint/{icons => img}/horzskew.ico (100%) rename base/applications/mspaint/{icons => img}/horzstretch.ico (100%) rename base/applications/mspaint/{icons => img}/iconbar.bmp (100%) rename base/applications/mspaint/{icons => img}/nontransparent.ico (100%) rename base/applications/mspaint/{icons => img}/paint.ico (100%) rename base/applications/mspaint/{icons => img}/paint.svg (100%) create mode 100644 base/applications/mspaint/img/pen.cur rename base/applications/mspaint/{icons => img}/transparency.xcf (100%) rename base/applications/mspaint/{icons => img}/transparent.ico (100%) rename base/applications/mspaint/{icons => img}/vertskew.ico (100%) rename base/applications/mspaint/{icons => img}/vertstretch.ico (100%) create mode 100644 base/applications/mspaint/img/zoom.cur diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index 94b8e26c680..d90fea481fd 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -28,7 +28,7 @@ list(APPEND SOURCE winproc.cpp precomp.h) -file(GLOB mspaint_rc_deps icons/*.*) +file(GLOB mspaint_rc_deps img/*.*) add_rc_deps(rsrc.rc ${mspaint_rc_deps}) add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 87553d04400..6ebe32a48ec 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -659,19 +659,19 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL switch (toolsModel.GetActiveTool()) { case TOOL_FILL: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL))); break; case TOOL_COLOR: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR))); break; case TOOL_ZOOM: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM))); break; case TOOL_PEN: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN))); break; case TOOL_AIRBRUSH: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH))); break; default: ::SetCursor(::LoadCursorW(NULL, (LPCWSTR)IDC_CROSS)); diff --git a/base/applications/mspaint/icons/airbrush_cur.ico b/base/applications/mspaint/icons/airbrush_cur.ico deleted file mode 100644 index aa1a09c5962abc3cad837db8a8d22d5c5047ad06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmeH|J!->15QU$mB;F`Lise{wem#vKu7xUxD5`V;p+l%j84SkP3BusUeU6~kU<|&2 z5V#E5jDk}HOKu!eX_mLees5=&*9_3$MFidj-UVO+cx3SrURcHXu2K{Qs;WW=0Zr3j z7zRw!gk@Ri_xrGI8;;{(Fc`pfU3i`c-}ey&0m3ju6h#;ghZv1Uh~pTO$pq8s6tme3 zNs?ebpJTCDV7XjkwOS!fQ)F3&^?D5{<*u*QtWKa#piZDp;ExiZJ^N5|)8L?@(dGfs zIx98&VB_+-*VuM!u-5L}5Yb_UL9{!!jP){HbZD7(jE^fZ3Vgnei;>CqukKHYF3Rxt zOjRFakpz M6B~%}xp zEXyJii4cuOiN#{X<8cy+1j%HQR4PR}ohFmXkj-Yv<#Ocnc?yLB#bS|CsYJP4rc$X; ztyZbkYSim>8jS|cW|LN{MZ4Xm)9KLdcIowc^!t4Vg8{?gkkM$wcsyn@nJ}GBnayU* z=W`Z|h4y_rvm3A*up6)&*q{Li9@W~tKT&f}@a{?%o^LO8Aso6;1^1JAt_u5)H)pD_ zXI-DFg7KinV7OG_I1t!Xg(H7pM-@2qZ|lN=Pu*Oo49lCJ(Wro8qEF5yjh7e0iq Z+-mhL!BY5!dPC~)KN$et2MCvHwCt5pi;IaB~tzad2=D2l4j%+CnIruTVM#-^;nfdERq5_bdlClw&rd+}nKLhR49M z5=x45CDgo@3ylSm{;CX=L6DbndQnM{UkHcKv-BcIPxC=@6bi2%6$ zHbY9O_1!gFPhdTP^#rc+1RiRC?$PevYQxrsntx{8Kenzk+_?_d_Vy1?-U+e7aIkZe z8wZCL+b5xD*$;pY?Knu9I^%mC(rrdMQs$QqInP`R1zscc`@&`T@$X+0y_3 diff --git a/base/applications/mspaint/icons/pen_cur.ico b/base/applications/mspaint/icons/pen_cur.ico deleted file mode 100644 index 107e55551ecb065dbf226ced29f71330ef1e8c64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmeH|J!slN7>A#jwE6cVHBDnuYtvYh#+WuWO=CYqXhB3o1SdCf5D~;dTpXnc;vnKC z;_A@FK^z1T$sjn2i#Ui>#66>h!oSxJ-8>2%>w7%M@&2A0?p+Sn#4;KYyTVrm_JC7? zXz^L_t1l~!MuVa#==FL`CKDEm1*_GH-EPO>aNu-0ak*T$-EKS{4_>bqpU;Qi?L-)ArwFdPmUjYf>eV)rAOt SY>LLZ;7=&dH-hhi-}MvF{M!Qn diff --git a/base/applications/mspaint/icons/zoom_cur.ico b/base/applications/mspaint/icons/zoom_cur.ico deleted file mode 100644 index 072b2c3a238d44fa042ea2ada27a5d8b50a7969d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmeH|%}Z)Q7{(v_(z=>`-+QZ5>am;FsZ*w9=O77!;L4RNL2xAqg5c7{#g!lkf-6A~ z1VM1+QV<0H0Kt_Y2!h~BFa$9qn#OfU;lkbJGraS{`+H|#9+(+GMu$cNIxA3A07n1} zG-wHS8ngO5F$_c3YQVBAj7B3kjsws0FqurSSS+wwtq?^KHk%E0yB!XP15T$CE|&{# zw;LXh2VSoiKA#VMzaN1>0Ks4op->3na2SzD1kq>|u~-c8cpQmD0?A|&sZ(~D0mWhwrBVsyav7CM1=VU5wOS4JdL4~M1I=a=tyT-|b{m~e2iphgphd_EbB`LzO4iFZhuGZvI|eWX3}vB8ss~_ zjuv3m-s*}Z)*7t>|6})1HhWUPN+awmm1^_Twlro1#feU@Rddpti~614x=VweQQd#t zdRDnwzcD}Z?CI8>G&ji2f*^3m${T5ZvH3vxTy=Uo w2a6(mf6H04bMX@Ve+THlxIiC&33-1Z=ZQ&$lSStcS-W!EP;(#DiDuiKCloSKnww1wtf=o)(NLwlVDY_r` z{`RfvO*J*iH+3`Sz3n-5Nu9~D!CIJRZg;4f+3U-{_{Vr0(1G(5b~BzeRE1gb0;xZ+ j0A9WRN|rnFXc-TNv0gD&hEHe3ometD6{hcY6F>0++bW!J literal 0 HcmV?d00001 diff --git a/base/applications/mspaint/img/color.cur b/base/applications/mspaint/img/color.cur new file mode 100644 index 0000000000000000000000000000000000000000..ac736b21b79701be860ca124795a0e1c28fd995c GIT binary patch literal 766 zcmd^-F%H5o5Cqo&$z@W}l9Ffe6TU!aI*e%YEb|j28cNC(5oVl-!VV3hw0E2H^zBbb~QogFKd^ literal 0 HcmV?d00001 diff --git a/base/applications/mspaint/img/fill.cur b/base/applications/mspaint/img/fill.cur new file mode 100644 index 0000000000000000000000000000000000000000..df2fbe6c1a2992eacd9304d98cb560a77562f5bc GIT binary patch literal 766 zcmd^5F%p6>5M0rj&_QJjrKLZBr}zZA&?TLD7SFMyGX=xB0VP1?*m}txd$$`VIUvCS zWeMb5j|4aaxDafiCJs0;1D4t+a*}{KEJZSF=MOU}VbOIR1(`NP0wcIWE2RGkwR@_z zn}%v#tm$=5`lX?p)UC(m8Yh`VgV$}}ug00(wU{Ua9>(})`5%cg&vglyjST3mjMeof wWnZT||5qg+^+Sw2GZ>M!lCdddyk#=fN(LMWB_lYSYa!yR**66L8{uq>7nfS6Y5)KL literal 0 HcmV?d00001 diff --git a/base/applications/mspaint/icons/fontstoolbar.bmp b/base/applications/mspaint/img/fontstoolbar.bmp similarity index 100% rename from base/applications/mspaint/icons/fontstoolbar.bmp rename to base/applications/mspaint/img/fontstoolbar.bmp diff --git a/base/applications/mspaint/icons/handdrag.cur b/base/applications/mspaint/img/handdrag.cur similarity index 100% rename from base/applications/mspaint/icons/handdrag.cur rename to base/applications/mspaint/img/handdrag.cur diff --git a/base/applications/mspaint/icons/horzskew.ico b/base/applications/mspaint/img/horzskew.ico similarity index 100% rename from base/applications/mspaint/icons/horzskew.ico rename to base/applications/mspaint/img/horzskew.ico diff --git a/base/applications/mspaint/icons/horzstretch.ico b/base/applications/mspaint/img/horzstretch.ico similarity index 100% rename from base/applications/mspaint/icons/horzstretch.ico rename to base/applications/mspaint/img/horzstretch.ico diff --git a/base/applications/mspaint/icons/iconbar.bmp b/base/applications/mspaint/img/iconbar.bmp similarity index 100% rename from base/applications/mspaint/icons/iconbar.bmp rename to base/applications/mspaint/img/iconbar.bmp diff --git a/base/applications/mspaint/icons/nontransparent.ico b/base/applications/mspaint/img/nontransparent.ico similarity index 100% rename from base/applications/mspaint/icons/nontransparent.ico rename to base/applications/mspaint/img/nontransparent.ico diff --git a/base/applications/mspaint/icons/paint.ico b/base/applications/mspaint/img/paint.ico similarity index 100% rename from base/applications/mspaint/icons/paint.ico rename to base/applications/mspaint/img/paint.ico diff --git a/base/applications/mspaint/icons/paint.svg b/base/applications/mspaint/img/paint.svg similarity index 100% rename from base/applications/mspaint/icons/paint.svg rename to base/applications/mspaint/img/paint.svg diff --git a/base/applications/mspaint/img/pen.cur b/base/applications/mspaint/img/pen.cur new file mode 100644 index 0000000000000000000000000000000000000000..98f90d0388baf4393c6f88a3dadaef7b2082d16d GIT binary patch literal 766 zcmd^-u?~VT5Qcxyq--#`%II6@BXy&jH4g3OEA>$v9ofXhWTx;msl1sXgm!YEAla^d-5P-ya1|3o<#rv literal 0 HcmV?d00001 diff --git a/base/applications/mspaint/icons/transparency.xcf b/base/applications/mspaint/img/transparency.xcf similarity index 100% rename from base/applications/mspaint/icons/transparency.xcf rename to base/applications/mspaint/img/transparency.xcf diff --git a/base/applications/mspaint/icons/transparent.ico b/base/applications/mspaint/img/transparent.ico similarity index 100% rename from base/applications/mspaint/icons/transparent.ico rename to base/applications/mspaint/img/transparent.ico diff --git a/base/applications/mspaint/icons/vertskew.ico b/base/applications/mspaint/img/vertskew.ico similarity index 100% rename from base/applications/mspaint/icons/vertskew.ico rename to base/applications/mspaint/img/vertskew.ico diff --git a/base/applications/mspaint/icons/vertstretch.ico b/base/applications/mspaint/img/vertstretch.ico similarity index 100% rename from base/applications/mspaint/icons/vertstretch.ico rename to base/applications/mspaint/img/vertstretch.ico diff --git a/base/applications/mspaint/img/zoom.cur b/base/applications/mspaint/img/zoom.cur new file mode 100644 index 0000000000000000000000000000000000000000..23adbec2bf746556138bcaa84b660438da902760 GIT binary patch literal 766 zcmd5)F%E)25FFHG>7cTe(qHJ4=$4M_pyNwC#nST1D~#)$#Bi4w6Dyr#c4v0DI|_ge z3N#H+b6q#U9>9_02xqdujumjsUZ^P|7dVDg&Ml3Vl608onSnhYm_!`_Q(Q#0}4$5j8+ss=~x8~BBW%-cj7*(^6m5^S)9`yf; d|G)>_d$ZfgEU