From 864f18ba2f21a0eb1977acc53ebe733acdfc8d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 24 Mar 2020 09:39:06 +0100
Subject: [PATCH] widgets: Re-calculate focus frame style option after setting
 new geometry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: QTBUG-83019
Change-Id: I75d3d93732cb0c5a5b7350f19f0227998bda4791
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit bd78753d625c573eef587fc0b8e767cffb99c2bf)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/widgets/widgets/qfocusframe.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/widgets/widgets/qfocusframe.cpp b/src/widgets/widgets/qfocusframe.cpp
index 4e793d7a29..aa9de7c35f 100644
--- a/src/widgets/widgets/qfocusframe.cpp
+++ b/src/widgets/widgets/qfocusframe.cpp
@@ -99,6 +99,8 @@ void QFocusFramePrivate::updateSize()
         return;
 
     q->setGeometry(geom);
+
+    opt.rect = q->rect();
     QStyleHintReturnMask mask;
     if (q->style()->styleHint(QStyle::SH_FocusFrame_Mask, &opt, q, &mask))
         q->setMask(mask.region);