Merge pull request #6404 from slarosa/cursor_size_fix

nyalldawson · web-flow · commit e24b6e60bb09 · 2018-02-23T09:30:34.000+11:00
Fixes #18043: Zoom and identify tools very small on MacOSX with retina display
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -556,6 +556,13 @@ QCursor QgsApplication::getThemeCursor( Cursor cursor )
   {
     // Apply scaling
     float scale = Qgis::UI_SCALE_FACTOR * app->fontMetrics().height() / 32.0;
+#ifdef Q_OS_MACX
+    if ( app->devicePixelRatio() >= 2 )
+    {
+      scale *= app->devicePixelRatio();
+      activeX = activeY = 5;
+    }
+#endif
     cursorIcon = QCursor( icon.pixmap( std::ceil( scale * 32 ), std::ceil( scale * 32 ) ), std::ceil( scale * activeX ), std::ceil( scale * activeY ) );
   }
   if ( app )

Original file line number	Diff line number	Diff line change
`@@ -556,6 +556,13 @@ QCursor QgsApplication::getThemeCursor( Cursor cursor )`
`556`	`556`	`{`
`557`	`557`	`// Apply scaling`
`558`	`558`	`float scale = Qgis::UI_SCALE_FACTOR * app->fontMetrics().height() / 32.0;`
	`559`	`+#ifdef Q_OS_MACX`
	`560`	`+ if ( app->devicePixelRatio() >= 2 )`
	`561`	`+ {`
	`562`	`+ scale *= app->devicePixelRatio();`
	`563`	`+ activeX = activeY = 5;`
	`564`	`+ }`
	`565`	`+#endif`
`559`	`566`	`cursorIcon = QCursor( icon.pixmap( std::ceil( scale * 32 ), std::ceil( scale * 32 ) ), std::ceil( scale * activeX ), std::ceil( scale * activeY ) );`
`560`	`567`	`}`
`561`	`568`	`if ( app )`