From b7e56a45620236510ecaccf05b6bb3e07cf9e9b1 Mon Sep 17 00:00:00 2001
From: YeShanShan <yeshanshan@uniontech.com>
Date: Mon, 13 Jan 2025 14:04:21 +0800
Subject: [PATCH] fix: Menu's focus not be clean

The bug can be see at QTBUG-99897.

pms: BUG-300051
---
 qt6/src/qml/Menu.qml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/qt6/src/qml/Menu.qml b/qt6/src/qml/Menu.qml
index c289a6f0..060eb544 100644
--- a/qt6/src/qml/Menu.qml
+++ b/qt6/src/qml/Menu.qml
@@ -43,13 +43,11 @@ T.Menu {
         blurControl: control
     }
 
-    contentItem: Control {
-        topPadding: 0
-        bottomPadding: topPadding
-        leftPadding: 0
-        rightPadding: leftPadding
-
-        contentItem:  ColumnLayout {
+    contentItem: FocusScope {
+        // QTBUG-99897 focus doesn't be clear.
+        width: viewLayout.width
+        height: viewLayout.height
+        ColumnLayout {
             id: viewLayout
             spacing: 0