From 6fb1972875e62aa3d5ef6e80623e6ee4fb743084 Mon Sep 17 00:00:00 2001
From: WandererFan <wandererfan@gmail.com>
Date: Wed, 7 Feb 2018 08:38:33 -0500
Subject: [PATCH] Fix hidden click handles on Templates

- on some Templates, the green click handles for
  editing text were being painted under the Template
  and were not visible.
---
 src/Mod/TechDraw/Gui/QGISVGTemplate.cpp    | 9 ++++++---
 src/Mod/TechDraw/Gui/TemplateTextField.cpp | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
index 9a50bb59ee..5ae96f04c0 100644
--- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
@@ -61,6 +61,10 @@ QGISVGTemplate::QGISVGTemplate(QGraphicsScene *scene)
     m_svgItem->setCacheMode(QGraphicsItem::NoCache);
 
     addToGroup(m_svgItem);
+
+    m_svgItem->setZValue(ZVALUE::SVGTEMPLATE);
+    setZValue(ZVALUE::SVGTEMPLATE);
+
 }
 
 QGISVGTemplate::~QGISVGTemplate()
@@ -197,6 +201,7 @@ void QGISVGTemplate::createClickHandles(void)
 
             double editClickBoxSize = Rez::guiX(dotSize);
             QColor editClickBoxColor = Qt::green;
+            editClickBoxColor.setAlpha(128);              //semi-transparent
 
             double width = editClickBoxSize;
             double height = editClickBoxSize;
@@ -206,7 +211,6 @@ void QGISVGTemplate::createClickHandles(void)
 
             item->setRect(x - pad, Rez::guiX(-tmplte->getHeight()) + y - height - pad,
                           width + 2 * pad, height + 2 * pad);
-
             QPen myPen;
             QBrush myBrush(editClickBoxColor,Qt::SolidPattern);
             myPen.setStyle(Qt::SolidLine);
@@ -215,14 +219,13 @@ void QGISVGTemplate::createClickHandles(void)
             item->setPen(myPen);
             item->setBrush(myBrush);
 
-            item->setZValue(ZVALUE::SVGTEMPLATE);
+            item->setZValue(ZVALUE::SVGTEMPLATE + 1);
             addToGroup(item);
             textFields.push_back(item);
         }
 
         begin = tagMatch[0].second;
     }
-
 }
 
 #include <Mod/TechDraw/Gui/moc_QGISVGTemplate.cpp>
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.cpp b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
index 55370584af..20061a03fb 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.cpp
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
@@ -40,7 +40,9 @@ TemplateTextField::TemplateTextField(QGraphicsItem *parent,
     : QGraphicsRectItem(parent),
       tmplte(myTmplte),
       fieldNameStr(myFieldName)
-{ }
+{
+    setToolTip(QObject::tr("Click to update text"));
+ }
 
 void TemplateTextField::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {