diff --git a/qt6/src/qml/FlowStyle.qml b/qt6/src/qml/FlowStyle.qml index 7c089f110..c09180d98 100644 --- a/qt6/src/qml/FlowStyle.qml +++ b/qt6/src/qml/FlowStyle.qml @@ -693,30 +693,32 @@ QtObject { property QtObject menu: QtObject { property int padding: 6 - property int topPadding: 8 + property int topPadding: 6 property int radius: D.DTK.platformTheme.windowRadius < 0 ? 12 : D.DTK.platformTheme.windowRadius property int margins: 10 property int overlap: 1 property QtObject item: QtObject { property int width: 180 - property int height: 30 + property int height: 26 property size iconSize: Qt.size(14, 14) property int count: 0 property int contentPadding: 30 property int indicatorMargin: 10 property int radius: 6 + property int padding: 3 } property QtObject separator: QtObject { - property int lineTopPadding : 0 - property int lineBottomPadding : 0 + property int lineTopPadding : 3 + property int lineBottomPadding : 3 property int lineHeight : 2 property int topPadding: 11 property int bottomPadding: 2 property D.Palette lineColor: D.Palette { normal: Qt.rgba(0, 0, 0, 0.1) + normalDark: Qt.rgba(1, 1, 1, 0.1) } } diff --git a/qt6/src/qml/MenuItem.qml b/qt6/src/qml/MenuItem.qml index ea6d6e8a3..5ec6e1654 100644 --- a/qt6/src/qml/MenuItem.qml +++ b/qt6/src/qml/MenuItem.qml @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later @@ -14,10 +14,10 @@ T.MenuItem { implicitWidth: DS.Style.control.implicitWidth(control) implicitHeight: DS.Style.control.implicitHeight(control) baselineOffset: contentItem.y + contentItem.baselineOffset - padding: DS.Style.control.padding + padding: DS.Style.menu.item.padding spacing: DS.Style.control.spacing opacity: D.ColorSelector.controlState === D.DTK.DisabledState ? 0.4 : 1 - highlighted: hovered || (subMenu && subMenu.visible) + highlighted: enabled && (hovered || (subMenu && subMenu.visible)) icon { height: DS.Style.menu.item.iconSize.height width: DS.Style.menu.item.iconSize.height