summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari P <kari.pihkala@gmail.com>2013-10-24 08:56:30 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-31 07:59:25 +0100
commita316bdadc0200cf1a0e60562364f84c0f49d1488 (patch)
treee1c0d855b9060d85789405b2ad49bab471ca82c7
parente00a961732ad028a1ead1eae1d8aecf1492d3008 (diff)
Mac: Modify Qt::SizeAllCursor to look like arrows
On Mac, Qt::SizeAllCursor showed a spreadsheet cell selection cursor. It has been changed to look like it looks in the Qt Documentation. Task-number: QTBUG-27577 Change-Id: I2d50ab0d813137366b56cb30b8784ecf70392d4e Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--src/plugins/platforms/cocoa/images/sizeallcursor.pngbin0 -> 703 bytes
-rw-r--r--src/plugins/platforms/cocoa/qcocoacursor.mm4
-rw-r--r--src/plugins/platforms/cocoa/qcocoaresources.qrc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/images/sizeallcursor.png b/src/plugins/platforms/cocoa/images/sizeallcursor.png
new file mode 100644
index 0000000000..bb5381ba32
--- /dev/null
+++ b/src/plugins/platforms/cocoa/images/sizeallcursor.png
Binary files differ
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
index e5b41e7a88..d734c36d6f 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
@@ -218,8 +218,8 @@ NSCursor *QCocoaCursor::createCursorData(QCursor *cursor)
return createCursorFromPixmap(pixmap, hotspot);
break; }
case Qt::SizeAllCursor: {
- QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/pluscursor.png"));
- return createCursorFromPixmap(pixmap, hotspot);
+ QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/sizeallcursor.png"));
+ return createCursorFromPixmap(pixmap, QPoint(8, 8));
break; }
case Qt::BusyCursor: {
QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/waitcursor.png"));
diff --git a/src/plugins/platforms/cocoa/qcocoaresources.qrc b/src/plugins/platforms/cocoa/qcocoaresources.qrc
index 392300bb03..9e0640db7d 100644
--- a/src/plugins/platforms/cocoa/qcocoaresources.qrc
+++ b/src/plugins/platforms/cocoa/qcocoaresources.qrc
@@ -4,7 +4,7 @@
<file>images/forbiddencursor.png</file>
<file>images/spincursor.png</file>
<file>images/waitcursor.png</file>
-<file>images/pluscursor.png</file>
+<file>images/sizeallcursor.png</file>
</qresource>
<qresource prefix="/qt-project.org/mac/style">
<file>images/leopard-unified-toolbar-on.png</file>