From 1e7d5a1751cd2122b3f508ead5cf2e196ce00ab1 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:51:12 -0800 Subject: [PATCH] include brush setting in gizmo handle draw function --- app/node/distort/crop/cropdistortnode.cpp | 2 -- app/node/distort/transform/transformdistortnode.cpp | 3 --- app/node/generator/shape/shapenodebase.cpp | 2 -- app/node/node.cpp | 3 +++ 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/node/distort/crop/cropdistortnode.cpp b/app/node/distort/crop/cropdistortnode.cpp index 009e05310..3307502e3 100644 --- a/app/node/distort/crop/cropdistortnode.cpp +++ b/app/node/distort/crop/cropdistortnode.cpp @@ -108,8 +108,6 @@ void CropDistortNode::DrawGizmos(const NodeValueRow &row, const NodeGlobals &glo gizmo_resize_handle_[kGizmoScaleCenterLeft] = CreateGizmoHandleRect(QPointF(left_pt, center_y_pt), handle_radius); gizmo_resize_handle_[kGizmoScaleCenterRight] = CreateGizmoHandleRect(QPointF(right_pt, center_y_pt), handle_radius); - p->setPen(Qt::NoPen); - p->setBrush(Qt::white); DrawAndExpandGizmoHandles(p, handle_radius, gizmo_resize_handle_, kGizmoScaleCount); } diff --git a/app/node/distort/transform/transformdistortnode.cpp b/app/node/distort/transform/transformdistortnode.cpp index 483b9f001..260445b66 100644 --- a/app/node/distort/transform/transformdistortnode.cpp +++ b/app/node/distort/transform/transformdistortnode.cpp @@ -473,9 +473,6 @@ void TransformDistortNode::DrawGizmos(const NodeValueRow &row, const NodeGlobals anchor_pt.x(), anchor_pt.y() + anchor_pt_radius)}); // Draw scale handles - p->setPen(Qt::NoPen); - p->setBrush(Qt::white); - gizmo_resize_handle_[kGizmoScaleTopLeft] = CreateGizmoHandleRect(CreateScalePoint(-1, -1, sequence_half_res_pt, rectangle_matrix), resize_handle_rad); gizmo_resize_handle_[kGizmoScaleTopCenter] = CreateGizmoHandleRect(CreateScalePoint( 0, -1, sequence_half_res_pt, rectangle_matrix), resize_handle_rad); gizmo_resize_handle_[kGizmoScaleTopRight] = CreateGizmoHandleRect(CreateScalePoint( 1, -1, sequence_half_res_pt, rectangle_matrix), resize_handle_rad); diff --git a/app/node/generator/shape/shapenodebase.cpp b/app/node/generator/shape/shapenodebase.cpp index d5c03b0ac..033ecca78 100644 --- a/app/node/generator/shape/shapenodebase.cpp +++ b/app/node/generator/shape/shapenodebase.cpp @@ -85,8 +85,6 @@ void ShapeNodeBase::DrawGizmos(const NodeValueRow &row, const NodeGlobals &globa gizmo_resize_handle_[kGizmoScaleCenterLeft] = CreateGizmoHandleRect(QPointF(left_pt, center_y_pt), handle_radius); gizmo_resize_handle_[kGizmoScaleCenterRight] = CreateGizmoHandleRect(QPointF(right_pt, center_y_pt), handle_radius); - p->setPen(Qt::NoPen); - p->setBrush(Qt::white); DrawAndExpandGizmoHandles(p, handle_radius, gizmo_resize_handle_, kGizmoScaleCount); } diff --git a/app/node/node.cpp b/app/node/node.cpp index fa2aacc8b..57bf193b5 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -1779,6 +1779,9 @@ double Node::GetGizmoHandleRadius(const QTransform &transform) void Node::DrawAndExpandGizmoHandles(QPainter *p, int handle_radius, QRectF *rects, int count) { + p->setPen(Qt::NoPen); + p->setBrush(Qt::white); + for (int i=0; i