UI: Removal of Win32 Platform-Specific Cursor Files
We are now able to make antialiased mouse cursors at any size directly from SVG sources. Therefore there is no need for the platform-specific "cur" versions of these cursors. This removes the work required in duplicating the cursors in this format. Otherwise the results should be identical. Pull Request: https://projects.blender.org/blender/blender/pulls/141309
@@ -716,7 +716,6 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const
|
||||
{
|
||||
/* Convert GHOST cursor to Windows OEM cursor. */
|
||||
HANDLE cursor = nullptr;
|
||||
HMODULE module = ::GetModuleHandle(0);
|
||||
uint32_t flags = LR_SHARED | LR_DEFAULTSIZE;
|
||||
int cx = 0, cy = 0;
|
||||
|
||||
@@ -728,57 +727,9 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const
|
||||
else {
|
||||
return nullptr;
|
||||
}
|
||||
case GHOST_kStandardCursorRightArrow:
|
||||
cursor = ::LoadImage(module, "arrowright_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorLeftArrow:
|
||||
cursor = ::LoadImage(module, "arrowleft_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorUpArrow:
|
||||
cursor = ::LoadImage(module, "arrowup_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorDownArrow:
|
||||
cursor = ::LoadImage(module, "arrowdown_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorVerticalSplit:
|
||||
cursor = ::LoadImage(module, "splitv_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorHorizontalSplit:
|
||||
cursor = ::LoadImage(module, "splith_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorKnife:
|
||||
cursor = ::LoadImage(module, "knife_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorEyedropper:
|
||||
cursor = ::LoadImage(module, "eyedropper_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorZoomIn:
|
||||
cursor = ::LoadImage(module, "zoomin_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorZoomOut:
|
||||
cursor = ::LoadImage(module, "zoomout_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorMove:
|
||||
cursor = ::LoadImage(nullptr, IDC_SIZEALL, IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorHandOpen:
|
||||
cursor = ::LoadImage(module, "handopen_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorHandClosed:
|
||||
cursor = ::LoadImage(module, "handclosed_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorHandPoint:
|
||||
cursor = ::LoadImage(module, "handpoint_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorNSEWScroll:
|
||||
cursor = ::LoadImage(module, "scrollnsew_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorNSScroll:
|
||||
cursor = ::LoadImage(module, "scrollns_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorEWScroll:
|
||||
cursor = ::LoadImage(module, "scrollew_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorHelp:
|
||||
cursor = ::LoadImage(nullptr, IDC_HELP, IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Arrow and question mark */
|
||||
@@ -788,26 +739,6 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const
|
||||
case GHOST_kStandardCursorText:
|
||||
cursor = ::LoadImage(nullptr, IDC_IBEAM, IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* I-beam */
|
||||
case GHOST_kStandardCursorCrosshair:
|
||||
cursor = ::LoadImage(module, "cross_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Standard Cross */
|
||||
case GHOST_kStandardCursorCrosshairA:
|
||||
cursor = ::LoadImage(module, "crossA_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Crosshair A */
|
||||
case GHOST_kStandardCursorCrosshairB:
|
||||
cursor = ::LoadImage(module, "crossB_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Diagonal Crosshair B */
|
||||
case GHOST_kStandardCursorCrosshairC:
|
||||
cursor = ::LoadImage(module, "crossC_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Minimal Crosshair C */
|
||||
case GHOST_kStandardCursorBottomSide:
|
||||
case GHOST_kStandardCursorUpDown:
|
||||
cursor = ::LoadImage(module, "movens_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Double-pointed arrow pointing north and south */
|
||||
case GHOST_kStandardCursorLeftSide:
|
||||
case GHOST_kStandardCursorLeftRight:
|
||||
cursor = ::LoadImage(module, "moveew_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Double-pointed arrow pointing west and east */
|
||||
case GHOST_kStandardCursorTopSide:
|
||||
cursor = ::LoadImage(nullptr, IDC_UPARROW, IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Vertical arrow */
|
||||
@@ -823,26 +754,6 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const
|
||||
case GHOST_kStandardCursorBottomLeftCorner:
|
||||
cursor = ::LoadImage(nullptr, IDC_SIZENESW, IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorPencil:
|
||||
cursor = ::LoadImage(module, "pencil_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorEraser:
|
||||
cursor = ::LoadImage(module, "eraser_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorDestroy:
|
||||
case GHOST_kStandardCursorStop:
|
||||
cursor = ::LoadImage(module, "forbidden_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break; /* Slashed circle */
|
||||
case GHOST_kStandardCursorLeftHandle:
|
||||
cursor = ::LoadImage(module, "handle_left_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorRightHandle:
|
||||
cursor = ::LoadImage(module, "handle_right_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
case GHOST_kStandardCursorBothHandles:
|
||||
cursor = ::LoadImage(module, "handle_both_cursor", IMAGE_CURSOR, cx, cy, flags);
|
||||
break;
|
||||
|
||||
case GHOST_kStandardCursorDefault:
|
||||
cursor = nullptr;
|
||||
break;
|
||||
|
||||
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
@@ -12,36 +12,6 @@
|
||||
APPICON ICON DISCARDABLE "winblender.ico"
|
||||
BLENDERFILE ICON DISCARDABLE "winblenderfile.ico"
|
||||
|
||||
pointer_cursor CURSOR "cursors/pointer.cur"
|
||||
moveew_cursor CURSOR "cursors/moveew.cur"
|
||||
movens_cursor CURSOR "cursors/movens.cur"
|
||||
arrowdown_cursor CURSOR "cursors/arrowdown.cur"
|
||||
arrowleft_cursor CURSOR "cursors/arrowleft.cur"
|
||||
arrowright_cursor CURSOR "cursors/arrowright.cur"
|
||||
arrowup_cursor CURSOR "cursors/arrowup.cur"
|
||||
cross_cursor CURSOR "cursors/cross.cur"
|
||||
crossA_cursor CURSOR "cursors/crossa.cur"
|
||||
crossB_cursor CURSOR "cursors/crossb.cur"
|
||||
crossC_cursor CURSOR "cursors/crossc.cur"
|
||||
eraser_cursor CURSOR "cursors/eraser.cur"
|
||||
eyedropper_cursor CURSOR "cursors/eyedropper.cur"
|
||||
handopen_cursor CURSOR "cursors/handopen.cur"
|
||||
handclosed_cursor CURSOR "cursors/handclosed.cur"
|
||||
handpoint_cursor CURSOR "cursors/handpoint.cur"
|
||||
knife_cursor CURSOR "cursors/knife.cur"
|
||||
pencil_cursor CURSOR "cursors/pencil.cur"
|
||||
scrollew_cursor CURSOR "cursors/scrollew.cur"
|
||||
scrollns_cursor CURSOR "cursors/scrollns.cur"
|
||||
scrollnsew_cursor CURSOR "cursors/scrollnsew.cur"
|
||||
splith_cursor CURSOR "cursors/splith.cur"
|
||||
splitv_cursor CURSOR "cursors/splitv.cur"
|
||||
zoomin_cursor CURSOR "cursors/zoomin.cur"
|
||||
zoomout_cursor CURSOR "cursors/zoomout.cur"
|
||||
forbidden_cursor CURSOR "cursors/forbidden.cur"
|
||||
handle_left_cursor CURSOR "cursors/handle_left.cur"
|
||||
handle_right_cursor CURSOR "cursors/handle_right.cur"
|
||||
handle_both_cursor CURSOR "cursors/handle_both.cur"
|
||||
|
||||
IDR_VERSION1 VERSIONINFO
|
||||
FILEVERSION BLEN_VER_RC_1, BLEN_VER_RC_2, BLEN_VER_RC_3, BLEN_VER_RC_4
|
||||
PRODUCTVERSION BLEN_VER_RC_1, BLEN_VER_RC_2, BLEN_VER_RC_3, BLEN_VER_RC_4
|
||||
|
||||