From 0c429e3bc63223fcef8f2427982cb0097f034083 Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Sat, 1 Jun 2019 12:31:43 -0400
Subject: [PATCH] Fix regression in Caption handling

---
 src/Mod/TechDraw/App/DrawView.cpp | 1 +
 src/Mod/TechDraw/Gui/QGIView.cpp  | 6 ++----
 src/Mod/TechDraw/Gui/QGVPage.h    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp
index b5a77263e3..535e3df3dd 100644
--- a/src/Mod/TechDraw/App/DrawView.cpp
+++ b/src/Mod/TechDraw/App/DrawView.cpp
@@ -191,6 +191,7 @@ short DrawView::mustExecute() const
     if (!isRestoring()) {
         result  =  (Scale.isTouched()  ||
                     ScaleType.isTouched() ||
+                    Caption.isTouched() ||
                     X.isTouched() ||
                     Y.isTouched() );
     }
diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp
index f773e48ce0..f289df3cea 100644
--- a/src/Mod/TechDraw/Gui/QGIView.cpp
+++ b/src/Mod/TechDraw/Gui/QGIView.cpp
@@ -455,7 +455,8 @@ void QGIView::drawBorder()
         return;
     }
 
-    //show neither
+    drawCaption();   //always draw caption
+
     auto vp = static_cast<ViewProviderDrawingView*>(getViewProvider(getViewObject()));
     if (!getFrameState() && !vp->KeepLabel.getValue()) {
          m_label->hide();
@@ -463,10 +464,7 @@ void QGIView::drawBorder()
          m_lock->hide();
         return;
     }
-    drawCaption();
 
-    //show both or show label
-    //double margin = 2.0;
     m_label->hide();
     m_border->hide();
     m_lock->hide();
diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h
index 950676087a..4611354f5e 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.h
+++ b/src/Mod/TechDraw/Gui/QGVPage.h
@@ -154,7 +154,7 @@ private:
     double m_zoomIncrement;
     int m_reversePan;
     int m_reverseScroll;
-    bool m_borderState;
+/*    bool m_borderState;*/
     QLabel *balloonCursor;
     QPoint balloonCursorPos;
     void cancelBalloonPlacing(void);