From 7e60dcd73427bf555847384394abbf74ea02d7ed Mon Sep 17 00:00:00 2001
From: donovaly <uwestoehr@lyx.org>
Date: Fri, 20 Mar 2020 04:18:39 +0100
Subject: [PATCH] - add missing update on changed color - some minor code
 rearrangements and wording changes

---
 src/Mod/TechDraw/Gui/TaskBalloon.cpp         | 12 ++++++------
 src/Mod/TechDraw/Gui/TaskBalloon.ui          |  2 +-
 src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
index 4e5fdf4913..e84df036fa 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
@@ -83,18 +83,18 @@ TaskBalloon::TaskBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP)
     i = parent->dvBalloon->Shape.getValue();
     ui->comboSymbol->setCurrentIndex(i);
 
-    if (m_balloonVP != nullptr)
-        ui->textColor->setColor(m_balloonVP->Color.getValue().asValue<QColor>());
-
     ui->qsbFontSize->setUnit(Base::Unit::Length);
     ui->qsbLineWidth->setUnit(Base::Unit::Length);
     ui->qsbLineWidth->setSingleStep(0.100);
     ui->qsbBalloonKink->setUnit(Base::Unit::Length);
 
-    ui->qsbFontSize->setValue(m_balloonVP->Fontsize.getValue());
-    ui->qsbLineWidth->setValue(m_balloonVP->LineWidth.getValue());
+    if (balloonVP != nullptr) {
+        ui->textColor->setColor(balloonVP->Color.getValue().asValue<QColor>());
+        ui->qsbFontSize->setValue(balloonVP->Fontsize.getValue());
+        ui->qsbLineWidth->setValue(balloonVP->LineWidth.getValue());
+    }
     // new balloons have already the preferences BalloonKink length
-    ui->qsbBalloonKink->setValue(m_parent->dvBalloon->KinkLength.getValue());
+    ui->qsbBalloonKink->setValue(parent->dvBalloon->KinkLength.getValue());
 }
 
 TaskBalloon::~TaskBalloon()
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.ui b/src/Mod/TechDraw/Gui/TaskBalloon.ui
index e1225ac915..deb7162e26 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.ui
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.ui
@@ -51,7 +51,7 @@
      <item row="2" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
-        <string>Font Size:</string>
+        <string>Fontsize:</string>
        </property>
       </widget>
      </item>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
index 2db4ab4e9e..90ae93a7ad 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
@@ -155,6 +155,7 @@ void ViewProviderBalloon::onChanged(const App::Property* p)
 {
     if ((p == &Font)  ||
         (p == &Fontsize) ||
+        (p == &Color) ||
         (p == &LineWidth)) {
         QGIView* qgiv = getQView();
         if (qgiv) {