Force a small minimum distance when label outside mode is used, so that labels don't touch the polygon by default

nyalldawson · nyalldawson · commit 17c47f5ff010 · 2020-05-04T05:38:48.000+10:00
diff --git a/src/core/labeling/qgspallabeling.cpp b/src/core/labeling/qgspallabeling.cpp
@@ -2505,10 +2505,20 @@ void QgsPalLayerSettings::registerFeature( const QgsFeature &f, QgsRenderContext
 
   // when using certain placement modes, we force a tiny minimum distance. This ensures that
   // candidates are created just offset from a border and avoids candidates being incorrectly flagged as colliding with neighbours
-  if ( placement == QgsPalLayerSettings::Line || placement == QgsPalLayerSettings::Curved || placement == QgsPalLayerSettings::PerimeterCurved )
+  if ( placement == QgsPalLayerSettings::Line
+       || placement == QgsPalLayerSettings::Curved
+       || placement == QgsPalLayerSettings::PerimeterCurved )
   {
     distance = ( distance < 0 ? -1 : 1 ) * std::max( std::fabs( distance ), 1.0 );
   }
+  else if ( placement == QgsPalLayerSettings::OutsidePolygons
+            || ( ( placement == QgsPalLayerSettings::Horizontal
+                   || placement == QgsPalLayerSettings::AroundPoint
+                   || placement == QgsPalLayerSettings::OverPoint ||
+                   placement == QgsPalLayerSettings::Free ) && polygonPlacementFlags() & QgsLabeling::PolygonPlacementFlag::AllowPlacementOutsideOfPolygon ) )
+  {
+    distance = std::max( distance, 1.0 );
+  }
 
   if ( !qgsDoubleNear( distance, 0.0 ) )
   {
diff --git a/src/ui/qgstextformatwidgetbase.ui b/src/ui/qgstextformatwidgetbase.ui
@@ -694,7 +694,7 @@
               <item>
                <widget class="QStackedWidget" name="mLabelStackedWidget">
                 <property name="currentIndex">
-                 <number>6</number>
+                 <number>7</number>
                 </property>
                 <widget class="QWidget" name="mLabelPage_Text">
                  <layout class="QVBoxLayout" name="verticalLayout_6">
