Use window system provided cursors rather than bitmaps

qgis · Nov 24, 2015 · 3624d7b · 3624d7b
1 parent afd436d
commit 3624d7b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2484,9 +2484,7 @@ void QgisApp::createOverview()
 
   mOverviewCanvas->setWhatsThis( tr( "Map overview canvas. This canvas can be used to display a locator map that shows the current extent of the map canvas. The current extent is shown as a red rectangle. Any layer on the map can be added to the overview canvas." ) );
 
-  QBitmap overviewPanBmp = QBitmap::fromData( QSize( 16, 16 ), pan_bits );
-  QBitmap overviewPanBmpMask = QBitmap::fromData( QSize( 16, 16 ), pan_mask_bits );
-  mOverviewMapCursor = new QCursor( overviewPanBmp, overviewPanBmpMask, 0, 0 ); //set upper left corner as hot spot - this is better when extent marker is small; hand won't cover the marker
+  mOverviewMapCursor = new QCursor( Qt::OpenHandCursor );
   mOverviewCanvas->setCursor( *mOverviewMapCursor );
 //  QVBoxLayout *myOverviewLayout = new QVBoxLayout;
 //  myOverviewLayout->addWidget(overviewCanvas);

diff --git a/src/gui/qgscursors.h b/src/gui/qgscursors.h
@@ -24,8 +24,8 @@
 extern GUI_EXPORT const char *zoom_in[];
 extern GUI_EXPORT const char *zoom_out[];
 
-extern GUI_EXPORT const unsigned char pan_bits[];
-extern GUI_EXPORT const unsigned char pan_mask_bits[];
+extern GUI_EXPORT const unsigned char pan_bits[];      // TODO QGIS3: Removeme
+extern GUI_EXPORT const unsigned char pan_mask_bits[]; // TODO QGIS3: Removeme
 
 extern GUI_EXPORT const char *capture_point_cursor[];
 extern GUI_EXPORT const char *select_cursor[];

diff --git a/src/gui/qgsmaptoolpan.cpp b/src/gui/qgsmaptoolpan.cpp
@@ -28,9 +28,13 @@ QgsMapToolPan::QgsMapToolPan( QgsMapCanvas* canvas )
 {
   mToolName = tr( "Pan" );
   // set cursor
-  QBitmap panBmp = QBitmap::fromData( QSize( 16, 16 ), pan_bits );
-  QBitmap panBmpMask = QBitmap::fromData( QSize( 16, 16 ), pan_mask_bits );
-  mCursor = QCursor( panBmp, panBmpMask, 5, 5 );
+  mCursor = QCursor( Qt::OpenHandCursor );
+}
+
+void QgsMapToolPan::canvasPressEvent( QgsMapMouseEvent* e )
+{
+  if ( e->button() == Qt::LeftButton )
+    mCanvas->setCursor( QCursor( Qt::ClosedHandCursor ) );
 }
 
 
@@ -61,4 +65,5 @@ void QgsMapToolPan::canvasReleaseEvent( QgsMapMouseEvent* e )
       mCanvas->refresh();
     }
   }
+  mCanvas->setCursor( mCursor );
 }
diff --git a/src/gui/qgsmaptoolpan.h b/src/gui/qgsmaptoolpan.h
@@ -32,6 +32,9 @@ class GUI_EXPORT QgsMapToolPan : public QgsMapTool
     //! constructor
     QgsMapToolPan( QgsMapCanvas* canvas );
 
+    //! Mouse press event
+    virtual void canvasPressEvent( QgsMapMouseEvent* e ) override;
+
     //! Overridden mouse move event
     virtual void canvasMoveEvent( QgsMapMouseEvent* e ) override;