AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCursor: Remove old pixmaps and use native cursor on macOS

Browse Source 
The DragCopyCursor part is a regression from ed55c4a14c.

Change-Id: Id98a40c372e48f09d8c1824a4c2c1df2a3bdd052
Task-number: QTBUG-58378
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
This commit is contained in:
Gabriel de Dietrich 2017-01-30 17:06:35 -08:00
parent fed6c35461
commit f6c17c37ba
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/plugins/platforms/cocoa/images/copyarrowcursor.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/plugins/platforms/cocoa/images/forbiddencursor.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

9
src/plugins/platforms/cocoa/qcocoacursor.mm
View File

@ -97,6 +97,9 @@ NSCursor *QCocoaCursor::convertCursor(QCursor *cursor)
case Qt::ArrowCursor:
cocoaCursor= [NSCursor arrowCursor];
break;
case Qt::ForbiddenCursor:
cocoaCursor = [NSCursor operationNotAllowedCursor];
break;
case Qt::CrossCursor:
cocoaCursor = [NSCursor crosshairCursor];
break;
@ -123,7 +126,7 @@ NSCursor *QCocoaCursor::convertCursor(QCursor *cursor)
cocoaCursor = [NSCursor crosshairCursor];
break;
case Qt::DragCopyCursor:
cocoaCursor = [NSCursor crosshairCursor];
cocoaCursor = [NSCursor dragCopyCursor];
break;
case Qt::DragLinkCursor:
cocoaCursor = [NSCursor dragLinkCursor];
@ -235,10 +238,6 @@ NSCursor *QCocoaCursor::createCursorData(QCursor *cursor)
QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/waitcursor.png"));
return createCursorFromPixmap(pixmap, hotspot);
break; }
case Qt::ForbiddenCursor: {
QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/forbiddencursor.png"));
return createCursorFromPixmap(pixmap, hotspot);
break; }
#define QT_USE_APPROXIMATE_CURSORS
#ifdef QT_USE_APPROXIMATE_CURSORS
case Qt::SizeVerCursor:

14
src/plugins/platforms/cocoa/qcocoaresources.qrc
View File

@ -1,9 +1,7 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/qt-project.org/mac/cursors">
<file>images/copyarrowcursor.png</file>
<file>images/forbiddencursor.png</file>
<file>images/spincursor.png</file>
<file>images/waitcursor.png</file>
<file>images/sizeallcursor.png</file>
</qresource>
<RCC>
<qresource prefix="/qt-project.org/mac/cursors">
<file>images/spincursor.png</file>
<file>images/waitcursor.png</file>
<file>images/sizeallcursor.png</file>
</qresource>
</RCC>