From 9904fe8621fc76ffebd4992a58b5a83acc9d3c35 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 3 Dec 2019 09:45:52 +1000
Subject: [PATCH] Refine behavior of obstacle weight slider to match feature
 weight slider

---
 src/gui/qgslabelinggui.cpp        | 4 ++--
 src/ui/qgstextformatwidgetbase.ui | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/qgslabelinggui.cpp b/src/gui/qgslabelinggui.cpp
index 61b5ac12a17..b7a4815b50a 100644
--- a/src/gui/qgslabelinggui.cpp
+++ b/src/gui/qgslabelinggui.cpp
@@ -288,7 +288,7 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
 
   mPrioritySlider->setValue( mSettings.priority );
   mChkNoObstacle->setChecked( mSettings.obstacle );
-  mObstacleFactorSlider->setValue( mSettings.obstacleFactor * 50 );
+  mObstacleFactorSlider->setValue( mSettings.obstacleFactor * 5 );
   mObstacleTypeComboBox->setCurrentIndex( mObstacleTypeComboBox->findData( mSettings.obstacleType ) );
   mPolygonObstacleTypeFrame->setEnabled( mSettings.obstacle );
   mObstaclePriorityFrame->setEnabled( mSettings.obstacle );
@@ -489,7 +489,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
 
   lyr.priority = mPrioritySlider->value();
   lyr.obstacle = mChkNoObstacle->isChecked() || mMode == ObstaclesOnly;
-  lyr.obstacleFactor = mObstacleFactorSlider->value() / 50.0;
+  lyr.obstacleFactor = mObstacleFactorSlider->value() / 5.0;
   lyr.obstacleType = ( QgsPalLayerSettings::ObstacleType )mObstacleTypeComboBox->currentData().toInt();
   lyr.labelPerPart = chkLabelPerFeaturePart->isChecked();
   lyr.displayAll = mPalShowAllLabelsForLayerChkBx->isChecked();
diff --git a/src/ui/qgstextformatwidgetbase.ui b/src/ui/qgstextformatwidgetbase.ui
index 6b5c900f4f3..4fbe987f2ee 100644
--- a/src/ui/qgstextformatwidgetbase.ui
+++ b/src/ui/qgstextformatwidgetbase.ui
@@ -6706,10 +6706,10 @@ font-style: italic;</string>
                                <number>0</number>
                               </property>
                               <property name="maximum">
-                               <number>100</number>
+                               <number>10</number>
                               </property>
                               <property name="value">
-                               <number>50</number>
+                               <number>5</number>
                               </property>
                               <property name="orientation">
                                <enum>Qt::Horizontal</enum>
@@ -6718,7 +6718,7 @@ font-style: italic;</string>
                                <enum>QSlider::TicksBelow</enum>
                               </property>
                               <property name="tickInterval">
-                               <number>10</number>
+                               <number>1</number>
                               </property>
                              </widget>
                             </item>