Skip to content

Commit 3fb2926

Browse files
committed
1 parent dee6853 commit 3fb2926

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

qt6/src/qml/FlowStyle.qml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -643,13 +643,13 @@ QtObject {
643643
property int height: 34
644644
property size iconSize: Qt.size(14, 14)
645645
property int count: 0
646-
property int contentPadding: 36
646+
property int contentPadding: 30
647647
property int indicatorMargin: 10
648648
}
649649

650650
property QtObject separator: QtObject {
651-
property int lineTopPadding : 6
652-
property int lineBottomPadding : 4
651+
property int lineTopPadding : 0
652+
property int lineBottomPadding : 0
653653
property int lineHeight : 2
654654
property int topPadding: 11
655655
property int bottomPadding: 2
@@ -660,8 +660,8 @@ QtObject {
660660
}
661661

662662
property D.Palette background: D.Palette {
663-
normal: behindWindowBlur.lightColor
664-
normalDark: behindWindowBlur.darkColor
663+
normal: Qt.rgba(235 / 255., 235 / 255., 235 / 255., 0.6)
664+
normalDark: ("#80000000")
665665
}
666666

667667
property D.Palette backgroundNoBlur: D.Palette {
@@ -686,7 +686,7 @@ QtObject {
686686

687687
property D.Palette itemText: D.Palette {
688688
normal: ("black")
689-
normalDark: Qt.rgba(1, 1, 1, 0.6)
689+
normalDark: ("white")
690690
}
691691

692692
property D.Palette separatorText: D.Palette {
@@ -814,7 +814,7 @@ QtObject {
814814

815815
property D.Palette insideBorder: D.Palette {
816816
normal: Qt.rgba(0, 0, 0, 0.05)
817-
normalDark: Qt.rgba(1, 1, 1, 0.05)
817+
normalDark: Qt.rgba(1, 1, 1, 0.1)
818818
}
819819
}
820820

qt6/src/qml/Menu.qml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ T.Menu {
3030
readonly property bool active: parent && parent.Window.active
3131

3232
implicitHeight: DS.Style.control.implicitHeight(control)
33-
implicitWidth: DS.Style.control.implicitWidth(control)
33+
implicitWidth: DS.Style.control.implicitWidth(control) - 10
3434
margins: DS.Style.menu.margins
3535
overlap: DS.Style.menu.overlap
3636
padding: DS.Style.menu.padding
@@ -42,7 +42,7 @@ T.Menu {
4242
}
4343

4444
contentItem: Control {
45-
topPadding: 6 // TODO how to clip radius
45+
topPadding: 15 // TODO how to clip radius
4646
bottomPadding: topPadding
4747
leftPadding: 0
4848
rightPadding: leftPadding
@@ -87,8 +87,8 @@ T.Menu {
8787
id: highlightRect
8888
anchors.left: parent ? parent.left : undefined
8989
anchors.right: parent ? parent.right : undefined
90-
anchors.leftMargin: 6
91-
anchors.rightMargin: 6
90+
anchors.leftMargin: 0
91+
anchors.rightMargin: 0
9292
scale: D.DTK.hasAnimation ? 0.9 : 1.0
9393
property D.Palette backgroundColor: DS.Style.highlightPanel.background
9494
property D.Palette submenuOpenedItemHighlightColor: DS.Style.menu.submenuOpenedItemHighlight
@@ -101,7 +101,7 @@ T.Menu {
101101
return D.ColorSelector.backgroundColor
102102
}
103103
}
104-
radius: 6
104+
radius: 1
105105
Component.onCompleted: {
106106
scale = 1.0
107107
}
@@ -138,6 +138,7 @@ T.Menu {
138138
blurMultiplier: 8.0
139139
backgroundColor: control.backgroundColor
140140
backgroundNoBlurColor: control.backgroundNoBlurColor
141+
outsideBorderColor: null
141142
}
142143
}
143144

0 commit comments

Comments
 (0)