From 66539741ac73c824cfbd16808fbd4ef5bbe201ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= <benj5378@outlook.com>
Date: Fri, 30 Aug 2024 20:02:01 +0200
Subject: [PATCH] [TechDraw] Some refactoring of frame pen

---
 src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 34 ++++++++++++++++-------
 src/Mod/TechDraw/Gui/QGIViewDimension.h   |  7 ++---
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index 8ef581913d..3c256d567e 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -99,8 +99,6 @@ QGIDatumLabel::QGIDatumLabel() : m_dragState(NoDrag)
     setSelectability(true);
     setFiltersChildEvents(true);
 
-    m_lineWidth = Rez::guiX(0.5);
-
     m_textItems = new QGraphicsItemGroup();
     m_textItems->setParentItem(this);
     m_dimText = new QGCustomText();
@@ -117,6 +115,12 @@ QGIDatumLabel::QGIDatumLabel() : m_dragState(NoDrag)
     m_unitText->setParentItem(m_textItems);
 
     m_frame = new QGraphicsRectItem();
+    QPen framePen;
+    framePen.setWidthF(Rez::guiX(0.5));
+    framePen.setColor(m_dimText->defaultTextColor());
+    framePen.setJoinStyle(Qt::MiterJoin);
+    m_frame->setPen(framePen);
+
     m_ctrl = false;
 }
 
@@ -364,6 +368,20 @@ void QGIDatumLabel::updateFrameRect() {
     m_frame->setRect(m_textItems->childrenBoundingRect().adjusted(-paddingLeft, -paddingTop, paddingRight, paddingBottom)); // Update bouding rect
 }
 
+void QGIDatumLabel::setLineWidth(double lineWidth)
+{
+    QPen pen = m_frame->pen();
+    pen.setWidthF(lineWidth);
+    m_frame->setPen(pen);
+}
+
+void QGIDatumLabel::setFrameColor(QColor color)
+{
+    QPen pen = m_frame->pen();
+    pen.setColor(color);
+    m_frame->setPen(pen);
+}
+
 void QGIDatumLabel::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
                           QWidget* widget)
 {
@@ -374,14 +392,6 @@ void QGIDatumLabel::paint(QPainter* painter, const QStyleOptionGraphicsItem* opt
 
     //    painter->setPen(Qt::blue);
     //    painter->drawRect(boundingRect());          //good for debugging
-
-    QPen framePen;
-    framePen.setWidthF(m_lineWidth);
-    framePen.setColor(m_dimText->defaultTextColor());
-    framePen.setJoinStyle(Qt::MiterJoin);
-    m_frame->setPen(framePen);
-
-
 }
 
 void QGIDatumLabel::setPosFromCenter(const double& xCenter, const double& yCenter)
@@ -573,6 +583,7 @@ void QGIDatumLabel::setPrettySel()
     m_tolTextOver->setPrettySel();
     m_tolTextUnder->setPrettySel();
     m_unitText->setPrettySel();
+    setFrameColor(PreferencesGui::selectQColor());
     Q_EMIT setPretty(SEL);
 }
 
@@ -583,6 +594,7 @@ void QGIDatumLabel::setPrettyPre()
     m_tolTextOver->setPrettyPre();
     m_tolTextUnder->setPrettyPre();
     m_unitText->setPrettyPre();
+    setFrameColor(PreferencesGui::preselectQColor());
     Q_EMIT setPretty(PRE);
 }
 
@@ -593,6 +605,7 @@ void QGIDatumLabel::setPrettyNormal()
     m_tolTextOver->setPrettyNormal();
     m_tolTextUnder->setPrettyNormal();
     m_unitText->setPrettyNormal();
+    setFrameColor(PreferencesGui::normalQColor());
     Q_EMIT setPretty(NORMAL);
 }
 
@@ -604,6 +617,7 @@ void QGIDatumLabel::setColor(QColor color)
     m_tolTextOver->setColor(m_colNormal);
     m_tolTextUnder->setColor(m_colNormal);
     m_unitText->setColor(m_colNormal);
+    setFrameColor(m_colNormal);
 }
 
 void QGIDatumLabel::setSelectability(bool val)
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h
index 202fdb64c8..2993c0c059 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.h
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h
@@ -90,6 +90,7 @@ public:
     void setPrettyNormal();
     void setColor(QColor color);
     void setSelectability(bool val);
+    void setFrameColor(QColor color);
 
     QGCustomText* getDimText() { return m_dimText; }
     void setDimText(QGCustomText* newText) { m_dimText = newText; }
@@ -103,8 +104,8 @@ public:
     bool isFramed() const { return m_frame->parentItem(); }  // If empty pointer, then no frame
     void setFramed(bool framed);
 
-    double getLineWidth() const { return m_lineWidth; }
-    void setLineWidth(double lineWidth) { m_lineWidth = lineWidth; }
+    double getLineWidth() const { return m_frame->pen().widthF(); }
+    void setLineWidth(double lineWidth);
     void setQDim(QGIViewDimension* qDim) { parent = qDim;}
 
 Q_SIGNALS:
@@ -149,8 +150,6 @@ private:
     double posX;
     double posY;
 
-    double m_lineWidth;
-
     int m_dragState;
 
 private: