Fix regression in Caption handling

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() );
     }

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();

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);