Merge pull request #990 from ra3xdh/fix-drawresizehandle-usage

Fix unnecessary setPen before draw_resize_handle
ra3xdh · Oct 12, 2024 · aae2501 · aae2501
2 parents e347b82 + 8ad28c5
commit aae2501
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/qucs/diagrams/tabdiagram.cpp b/qucs/diagrams/tabdiagram.cpp
@@ -116,7 +116,7 @@ void TabDiagram::paintDiagram(QPainter *painter) {
   if (isSelected) {
     painter->setPen(QPen(Qt::darkGray,3));
     painter->drawRect(-5, -y2-5, x2+10, y2+10);
-    painter->setPen(QPen(Qt::darkRed,2));
+
     misc::draw_resize_handle(painter, QPoint{0, -y2});
     misc::draw_resize_handle(painter, QPoint{0, 0});
     misc::draw_resize_handle(painter, QPoint{x2, -y2});

diff --git a/qucs/misc.cpp b/qucs/misc.cpp
@@ -846,11 +846,12 @@ void misc::draw_resize_handle(QPainter* painter, const QPointF& center) {
   // 1. Find out where on canvas lies the central point and remember these
   //    coordinates
   // 2. Remove all transformations and draw the handle in its natural size
-  QRectF resize_handle{0, 0, 10, 10};  // nothing special, just a size
+  static QRectF resize_handle{0, 0, 10, 10};  // nothing special, just a size
   resize_handle.moveCenter(painter->transform().map(center));
 
+  static QTransform transform{}; // reset transformation
   painter->save();
-  painter->setTransform(QTransform{});
+  painter->setTransform(transform);
   painter->setPen(QPen{Qt::darkRed, 2});
   painter->drawRect(resize_handle);
   painter->restore();

diff --git a/qucs/paintings/ellipse.cpp b/qucs/paintings/ellipse.cpp
@@ -57,8 +57,6 @@ void qucs::Ellipse::paint(QPainter *painter) {
     painter->setPen(QPen(Qt::white, Pen.width(), Pen.style()));
     painter->drawEllipse(cx, cy, x2, y2);
 
-    painter->setPen(QPen(Qt::darkRed,2));
-
     misc::draw_resize_handle(painter, QPoint{cx, cy});
     misc::draw_resize_handle(painter, QPoint{cx, cy + y2});
     misc::draw_resize_handle(painter, QPoint{cx + x2, cy});

diff --git a/qucs/paintings/ellipsearc.cpp b/qucs/paintings/ellipsearc.cpp
@@ -52,8 +52,6 @@ void EllipseArc::paint(QPainter *painter) {
     painter->setPen(QPen(Qt::white, Pen.width(), Pen.style()));
     painter->drawArc(cx, cy, x2, y2, Angle, ArcLen);
 
-    painter->setPen(QPen(Qt::darkRed, 2));
-
     misc::draw_resize_handle(painter, QPoint{cx, cy});
     misc::draw_resize_handle(painter, QPoint{cx, cy + y2});
     misc::draw_resize_handle(painter, QPoint{cx + x2, cy});