QmlDesigner: Refine selection indicator

The highlighted bounding rectangle has now the size of the
selection rectangle.
Because both rectangles do not have to match we draw both.

Change-Id: I0d4260e446c552622626153774a2cff489ebf584
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 11 insertions, 17 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
index 574fafac04..016c46657b 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
@@ -229,25 +229,19 @@ void FormEditorItem::paintBoundingRect(QPainter *painter) const
     QColor frameColor("#AAAAAA");
 
     if (scene()->showBoundingRects()) {
-        if (m_highlightBoundingRect) {
-            pen.setColor(frameColor);
-        } else {
-            pen.setColor(frameColor.darker(150));
-            pen.setStyle(Qt::DotLine);
-        }
-    } else {
-        if (m_highlightBoundingRect) {
-            pen.setColor(frameColor);
-        } else {
-            pen.setColor(Qt::transparent);
-            pen.setStyle(Qt::DotLine);
-        }
-    }
+        pen.setColor(frameColor.darker(150));
+        pen.setStyle(Qt::DotLine);
+        painter->setPen(pen);
+        painter->drawRect(m_boundingRect.adjusted(0., 0., -1., -1.));
 
-    painter->setPen(pen);
-//    int offset =  m_borderWidth / 2;
+    }
 
-    painter->drawRect(m_boundingRect.adjusted(0., 0., -1., -1.));
+    if (m_highlightBoundingRect) {
+        pen.setColor(frameColor);
+        pen.setStyle(Qt::SolidLine);
+        painter->setPen(pen);
+        painter->drawRect(m_selectionBoundingRect.adjusted(0., 0., -1., -1.));
+    }
 }
 
 static void paintTextInPlaceHolderForInvisbleItem(QPainter *painter,