From a219f92711a7b07b6d31dd9892f9ac3b75cfe177 Mon Sep 17 00:00:00 2001
From: donovaly <uwestoehr@lyx.org>
Date: Thu, 12 Mar 2020 13:36:46 +0100
Subject: [PATCH] [TD] fix arrow end None for dimensions

This was not merged from my PR to PR #3153

- also uniform the combobox appearance in the preferences
---
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui | 11 ++++-------
 src/Mod/TechDraw/Gui/QGIViewDimension.cpp |  8 ++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
index 3321684c22..5c20f2749c 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
@@ -140,9 +140,6 @@
           <property name="currentIndex">
            <number>-1</number>
           </property>
-          <property name="maxVisibleItems">
-           <number>5</number>
-          </property>
           <property name="prefEntry" stdset="0">
            <cstring>ArrowStyle</cstring>
           </property>
@@ -215,7 +212,7 @@
          </widget>
         </item>
         <item row="5" column="2">
-         <widget class="Gui::PrefUnitSpinBox" name="plsb_FontSize">
+         <widget class="Gui::PrefUnitSpinBox" name="plsb_FontSize" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -225,7 +222,7 @@
           <property name="toolTip">
            <string>Dimension font size</string>
           </property>
-          <property name="value">
+          <property name="value" stdset="0">
            <double>4.000000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
@@ -237,7 +234,7 @@
          </widget>
         </item>
         <item row="8" column="2">
-         <widget class="Gui::PrefUnitSpinBox" name="plsb_ArrowSize">
+         <widget class="Gui::PrefUnitSpinBox" name="plsb_ArrowSize" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -247,7 +244,7 @@
           <property name="toolTip">
            <string>Dimension arrowhead size</string>
           </property>
-          <property name="value">
+          <property name="value" stdset="0">
            <double>5.000000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index bf22ed0063..ec5062e429 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -1198,8 +1198,12 @@ void QGIViewDimension::drawArrows(int count, const Base::Vector2d positions[], d
         arrow->setSize(QGIArrow::getPrefArrowSize());
         arrow->setFlipped(flipped);
 
-        arrow->draw();
-        arrow->show();
+        if (QGIArrow::getPrefArrowStyle() != 0) { // if not "None"
+            arrow->draw();
+            arrow->show();
+        }
+        else
+            arrow->hide();
     }
 }