From e26a87f1ecc40bc8c6aa5b889fce67410a57a702 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 19 Aug 2023 20:27:24 +0200 Subject: [PATCH] WindowsVista style: fix subControlRect() in rtl mode During refactoring of the vista style in 46f98147f4e3a09b32042c0655d5de7285a795e3 a regression slipped into subControlRect()'s default branch which lead to a double call of visualRect(). This breaks nearly all subControlRect() calculations in rtl mode. Fixes: QTBUG-116224 Pick-to: 6.6 6.5 Change-Id: Ida722e1b6c6a311b27a9b48d1fe1378b47c21cf4 Reviewed-by: Samuel Gaist Reviewed-by: Santhosh Kumar --- src/plugins/styles/windowsvista/qwindowsvistastyle.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp index f94e782924a..0a11315f4ea 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp @@ -4508,8 +4508,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt #endif // QT_CONFIG(mdiarea) default: - return visualRect(option->direction, option->rect, - QWindowsStyle::subControlRect(control, option, subControl, widget)); + return QWindowsStyle::subControlRect(control, option, subControl, widget); } return visualRect(option->direction, option->rect, rect);