Skip to content

Replace Move cursor with system cursor on Windows #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pilot-Pirx merged 3 commits into from
Dec 6, 2025
Merged

Replace Move cursor with system cursor on Windows #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b5dc1f
Replace Move cursor with system cursor on Windows
Pilot-Pirx Dec 5, 2025
f06b48e
Additional files
Pilot-Pirx Dec 5, 2025
3d0c2c2
Also replace Hand cursors
Pilot-Pirx Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions main/vcl/WinResTarget_vcl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/dpie.cur \
vcl/win/source/src/movedata.cur \
vcl/win/source/src/rotate.cur \
vcl/win/source/src/50.png \
vcl/win/source/src/copydlnk.cur \
vcl/win/source/src/dpolygon.cur \
vcl/win/source/src/movedlnk.cur \
Expand All @@ -60,12 +59,10 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/tblsels.cur \
vcl/win/source/src/asne.cur \
vcl/win/source/src/crook.cur \
vcl/win/source/src/hand.cur \
vcl/win/source/src/movept.cur \
vcl/win/source/src/tblselse.cur \
vcl/win/source/src/asns.cur \
vcl/win/source/src/crop.cur \
vcl/win/source/src/neswsize.cur \
vcl/win/source/src/tblselsw.cur \
vcl/win/source/src/asnswe.cur \
vcl/win/source/src/cross.cur \
Expand All @@ -74,13 +71,11 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/tblselw.cur \
vcl/win/source/src/asnw.cur \
vcl/win/source/src/darc.cur \
vcl/win/source/src/hsize.cur \
vcl/win/source/src/nullptr.cur \
vcl/win/source/src/timemove.cur \
vcl/win/source/src/ass.cur \
vcl/win/source/src/dbezier.cur \
vcl/win/source/src/hsizebar.cur \
vcl/win/source/src/nwsesize.cur \
vcl/win/source/src/timesize.cur \
vcl/win/source/src/asse.cur \
vcl/win/source/src/dcapt.cur \
Expand All @@ -91,7 +86,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/dcirccut.cur \
vcl/win/source/src/linkdata.cur \
vcl/win/source/src/pivotcol.cur \
vcl/win/source/src/vsize.cur \
vcl/win/source/src/asw.cur \
vcl/win/source/src/dconnect.cur \
vcl/win/source/src/linkf.cur \
Expand All @@ -109,12 +103,10 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/vtext.cur \
vcl/win/source/src/chainnot.cur \
vcl/win/source/src/dfree.cur \
vcl/win/source/src/move.cur \
vcl/win/source/src/pntbrsh.cur \
vcl/win/source/src/chart.cur \
vcl/win/source/src/dline.cur \
vcl/win/source/src/movebw.cur \
vcl/win/source/src/refhand.cur \
))

else
Expand Down
18 changes: 8 additions & 10 deletions main/vcl/inc/win/salids.hrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,19 @@

// Cursor
#define SAL_RESID_POINTER_NULL 10000
//#define SAL_RESID_POINTER_HELP 10001 // Help Cursor only needed for older Windows versions was removed in December 2025
#ifndef WNT
#define SAL_RESID_POINTER_HSIZE 10002
#define SAL_RESID_POINTER_VSIZE 10003
#define SAL_RESID_POINTER_NESWSIZE 10004
#define SAL_RESID_POINTER_NWSESIZE 10005
#endif
//#define SAL_RESID_POINTER_HELP 10001 // "Help" cursor only needed for older Windows versions was removed in December 2025
//#define SAL_RESID_POINTER_HSIZE 10002 // "Horizontal resize" cursor only needed for older Windows versions was removed in December 2025
//#define SAL_RESID_POINTER_VSIZE 10003 // "Vertical resize" cursor only needed for older Windows versions was removed in December 2025
//#define SAL_RESID_POINTER_NESWSIZE 10004 // "Diagonal resize NESW" cursor only needed for older Windows versions was removed in December 2025
//#define SAL_RESID_POINTER_NWSESIZE 10005 // "Diagonal resize NWSE" cursor only needed for older Windows versions was removed in December 2025
#define SAL_RESID_POINTER_CROSS 10006
#define SAL_RESID_POINTER_MOVE 10007
//#define SAL_RESID_POINTER_MOVE 10007 // "Move" cursor for older Windows versions was replaced in December 2025
#define SAL_RESID_POINTER_HSPLIT 10008
#define SAL_RESID_POINTER_VSPLIT 10009
#define SAL_RESID_POINTER_HSIZEBAR 10010
#define SAL_RESID_POINTER_VSIZEBAR 10011
#define SAL_RESID_POINTER_HAND 10012
#define SAL_RESID_POINTER_REFHAND 10013
//#define SAL_RESID_POINTER_HAND 10012 // "Hand" cursor for older Windows versions was replaced in December 2025
//#define SAL_RESID_POINTER_REFHAND 10013 // "Refhand" cursor for older Windows versions was replaced in December 2025
#define SAL_RESID_POINTER_PEN 10014
#define SAL_RESID_POINTER_MAGNIFY 10015
#define SAL_RESID_POINTER_FILL 10016
Expand Down
Binary file removed main/vcl/win/source/src/50.png
View file
Open in desktop
Binary file not shown.
Binary file removed main/vcl/win/source/src/hand.cur
View file
Open in desktop
Binary file not shown.
Binary file removed main/vcl/win/source/src/hsize.cur
View file
Open in desktop
Binary file not shown.
Binary file removed main/vcl/win/source/src/move.cur
View file
Open in desktop
Binary file not shown.
Binary file removed main/vcl/win/source/src/neswsize.cur
View file
Open in desktop
Binary file not shown.
Binary file removed main/vcl/win/source/src/nwsesize.cur
View file
Open in desktop
Binary file not shown.
Binary file removed main/vcl/win/source/src/refhand.cur
View file
Open in desktop
Binary file not shown.
155 changes: 73 additions & 82 deletions main/vcl/win/source/src/salsrc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,87 +23,78 @@
#include <win/salids.hrc>
#endif

SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR
#ifndef WNT
SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR
SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR
SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR
SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR
#endif
SAL_RESID_POINTER_CROSS CURSOR CROSS.CUR
SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR
SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR
SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR
SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR
SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR
SAL_RESID_POINTER_HAND CURSOR HAND.CUR
SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR
SAL_RESID_POINTER_PEN CURSOR PEN.CUR
SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR
SAL_RESID_POINTER_FILL CURSOR FILL.CUR
SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR
SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR
SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR
SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR
SAL_RESID_POINTER_CROOK CURSOR CROOK.CUR
SAL_RESID_POINTER_CROP CURSOR CROP.CUR
SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR
SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR MOVEBW.CUR
SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR
SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR
SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR
SAL_RESID_POINTER_MOVEDATALINK CURSOR MOVEDLNK.CUR
SAL_RESID_POINTER_COPYDATALINK CURSOR COPYDLNK.CUR
SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR
SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR
SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR
SAL_RESID_POINTER_MOVEFILELINK CURSOR MOVEFLNK.CUR
SAL_RESID_POINTER_COPYFILELINK CURSOR COPYFLNK.CUR
SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR
SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR
SAL_RESID_POINTER_NOTALLOWED CURSOR NOTALLOW.CUR
SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR
SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR
SAL_RESID_POINTER_DRAW_POLYGON CURSOR DPOLYGON.CUR
SAL_RESID_POINTER_DRAW_BEZIER CURSOR DBEZIER.CUR
SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR
SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR
SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR DCIRCCUT.CUR
SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR DELLIPSE.CUR
SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR
SAL_RESID_POINTER_DRAW_CONNECT CURSOR DCONNECT.CUR
SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR
SAL_RESID_POINTER_DRAW_CAPTION CURSOR DCAPT.CUR
SAL_RESID_POINTER_CHART CURSOR CHART.CUR
SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR
SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR
SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR
SAL_RESID_POINTER_PIVOT_FIELD CURSOR PIVOTFLD.CUR
SAL_RESID_POINTER_PIVOT_DELETE CURSOR PIVOTDEL.CUR
SAL_RESID_POINTER_CHAIN CURSOR CHAIN.CUR
SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR CHAINNOT.CUR
SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR TIMEMOVE.CUR
SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR TIMESIZE.CUR
SAL_RESID_POINTER_AUTOSCROLL_N CURSOR ASN.CUR
SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ASS.CUR
SAL_RESID_POINTER_AUTOSCROLL_W CURSOR ASW.CUR
SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ASE.CUR
SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR ASNW.CUR
SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR ASNE.CUR
SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR ASSW.CUR
SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR
SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR
SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR
SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR ASNSWE.CUR
SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR
SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR
SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR
SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR
SAL_RESID_POINTER_TAB_SELECT_SE CURSOR TBLSELSE.CUR
SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR
SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR
SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR
SAL_RESID_POINTER_NULL CURSOR nullptr.cur
SAL_RESID_POINTER_CROSS CURSOR cross.cur
SAL_RESID_POINTER_HSPLIT CURSOR hsplit.cur
SAL_RESID_POINTER_VSPLIT CURSOR vsplit.cur
SAL_RESID_POINTER_HSIZEBAR CURSOR hsizebar.cur
SAL_RESID_POINTER_VSIZEBAR CURSOR vsizebar.cur
SAL_RESID_POINTER_PEN CURSOR pen.cur
SAL_RESID_POINTER_MAGNIFY CURSOR magnify.cur
SAL_RESID_POINTER_FILL CURSOR fill.cur
SAL_RESID_POINTER_ROTATE CURSOR rotate.cur
SAL_RESID_POINTER_HSHEAR CURSOR hshear.cur
SAL_RESID_POINTER_VSHEAR CURSOR vshear.cur
SAL_RESID_POINTER_MIRROR CURSOR mirror.cur
SAL_RESID_POINTER_CROOK CURSOR crook.cur
SAL_RESID_POINTER_CROP CURSOR crop.cur
SAL_RESID_POINTER_MOVEPOINT CURSOR movept.cur
SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR movebw.cur
SAL_RESID_POINTER_MOVEDATA CURSOR movedata.cur
SAL_RESID_POINTER_COPYDATA CURSOR copydata.cur
SAL_RESID_POINTER_LINKDATA CURSOR linkdata.cur
SAL_RESID_POINTER_MOVEDATALINK CURSOR movedlnk.cur
SAL_RESID_POINTER_COPYDATALINK CURSOR copydlnk.cur
SAL_RESID_POINTER_MOVEFILE CURSOR movef.cur
SAL_RESID_POINTER_COPYFILE CURSOR copyf.cur
SAL_RESID_POINTER_LINKFILE CURSOR linkf.cur
SAL_RESID_POINTER_MOVEFILELINK CURSOR moveflnk.cur
SAL_RESID_POINTER_COPYFILELINK CURSOR copyflnk.cur
SAL_RESID_POINTER_MOVEFILES CURSOR movef2.cur
SAL_RESID_POINTER_COPYFILES CURSOR copyf2.cur
SAL_RESID_POINTER_NOTALLOWED CURSOR notallow.cur
SAL_RESID_POINTER_DRAW_LINE CURSOR dline.cur
SAL_RESID_POINTER_DRAW_RECT CURSOR drect.cur
SAL_RESID_POINTER_DRAW_POLYGON CURSOR dpolygon.cur
SAL_RESID_POINTER_DRAW_BEZIER CURSOR dbezier.cur
SAL_RESID_POINTER_DRAW_ARC CURSOR darc.cur
SAL_RESID_POINTER_DRAW_PIE CURSOR dpie.cur
SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR dcirccut.cur
SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR dellipse.cur
SAL_RESID_POINTER_DRAW_FREEHAND CURSOR dfree.cur
SAL_RESID_POINTER_DRAW_CONNECT CURSOR dconnect.cur
SAL_RESID_POINTER_DRAW_TEXT CURSOR dtext.cur
SAL_RESID_POINTER_DRAW_CAPTION CURSOR dcapt.cur
SAL_RESID_POINTER_CHART CURSOR chart.cur
SAL_RESID_POINTER_DETECTIVE CURSOR detectiv.cur
SAL_RESID_POINTER_PIVOT_COL CURSOR pivotcol.cur
SAL_RESID_POINTER_PIVOT_ROW CURSOR pivotrow.cur
SAL_RESID_POINTER_PIVOT_FIELD CURSOR pivotfld.cur
SAL_RESID_POINTER_PIVOT_DELETE CURSOR pivotdel.cur
SAL_RESID_POINTER_CHAIN CURSOR chain.cur
SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR chainnot.cur
SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR timemove.cur
SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR timesize.cur
SAL_RESID_POINTER_AUTOSCROLL_N CURSOR asn.cur
SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ass.cur
SAL_RESID_POINTER_AUTOSCROLL_W CURSOR asw.cur
SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ase.cur
SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR asnw.cur
SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR asne.cur
SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR assw.cur
SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR asse.cur
SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR asns.cur
SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR aswe.cur
SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR asnswe.cur
SAL_RESID_POINTER_AIRBRUSH CURSOR airbrush.cur
SAL_RESID_POINTER_TEXT_VERTICAL CURSOR vtext.cur
SAL_RESID_POINTER_TAB_SELECT_S CURSOR tblsels.cur
SAL_RESID_POINTER_TAB_SELECT_E CURSOR tblsele.cur
SAL_RESID_POINTER_TAB_SELECT_SE CURSOR tblselse.cur
SAL_RESID_POINTER_TAB_SELECT_W CURSOR tblselw.cur
SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur

SAL_RESID_BITMAP_50 BITMAP 50.BMP
SAL_RESID_BITMAP_50 BITMAP 50.bmp

SAL_RESID_ICON_DEFAULT ICON SD.ICO
SAL_RESID_ICON_DEFAULT ICON sd.ico
Binary file removed main/vcl/win/source/src/vsize.cur
View file
Open in desktop
Binary file not shown.
Loading