Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions qt6/src/qml/FlowStyle.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
6 changes: 3 additions & 3 deletions qt6/src/qml/MenuItem.qml
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
Loading