Rebase to master

qgis · Jan 10, 2022 · 52e2c25 · 52e2c25
1 parent 028eaf8
commit 52e2c25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/app/labeling/qgsmaptoollabel.h b/src/app/labeling/qgsmaptoollabel.h
@@ -212,6 +212,8 @@ class APP_EXPORT QgsMapToolLabel: public QgsMapToolAdvancedDigitizing
     */
     bool isPinned();
 
+    bool labelMoveable( QgsVectorLayer *vlayer, const QgsPalLayerSettings &settings, int &xCol, int &yCol, int &pointCol ) const;
+
     bool createAuxiliaryFields( QgsPalIndexes &palIndexes );
     bool createAuxiliaryFields( LabelDetails &details, QgsPalIndexes &palIndexes ) const;
     bool createAuxiliaryFields( QgsDiagramIndexes &diagIndexes );

diff --git a/src/app/labeling/qgsmaptoolmovelabel.cpp b/src/app/labeling/qgsmaptoolmovelabel.cpp
@@ -243,18 +243,18 @@ void QgsMapToolMoveLabel::cadCanvasPressEvent( QgsMapMouseEvent *e )
             return;
           }
         }
+      }
 
-        mStartPointMapCoords = e->mapPoint();
-        QgsPointXY referencePoint;
-        if ( !currentLabelRotationPoint( referencePoint, !currentLabelPreserveRotation() ) )
-        {
-          referencePoint.setX( mCurrentLabel.pos.labelRect.xMinimum() );
-          referencePoint.setY( mCurrentLabel.pos.labelRect.yMinimum() );
-        }
-        mClickOffsetX = mStartPointMapCoords.x() - referencePoint.x();
-        mClickOffsetY = mStartPointMapCoords.y() - referencePoint.y();
-        createRubberBands();
+      mStartPointMapCoords = e->mapPoint();
+      QgsPointXY referencePoint;
+      if ( !currentLabelRotationPoint( referencePoint, !currentLabelPreserveRotation() ) )
+      {
+        referencePoint.setX( mCurrentLabel.pos.labelRect.xMinimum() );
+        referencePoint.setY( mCurrentLabel.pos.labelRect.yMinimum() );
       }
+      mClickOffsetX = mStartPointMapCoords.x() - referencePoint.x();
+      mClickOffsetY = mStartPointMapCoords.y() - referencePoint.y();
+      createRubberBands();
     }
   }
   else