Skip to content

Commit 2ded4b6

Browse files
18202781743deepin-bot[bot]
authored andcommitted
fix: drop strongInteractive of action for notification
Action is display in contentItem default, it avoids to hiding Combobox's popup when the count of Action is more than two.
1 parent 94936f5 commit 2ded4b6

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

panels/notification/plugin/NotifyItemContent.qml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import org.deepin.ds.notification
1212
NotifyItem {
1313
id: root
1414

15-
height:Math.max(DStyle.Style.control.implicitHeight(root),
16-
actionPlaceHolder.active ? root.miniContentHeight + actionPlaceHolder.height : 0)
1715
property bool closeVisible: root.hovered || root.activeFocus
1816
property int miniContentHeight: NotifyStyle.contentItem.miniHeight
1917

@@ -89,25 +87,6 @@ NotifyItem {
8987
}
9088
}
9189

92-
Control {
93-
id: actionPlaceHolder
94-
anchors {
95-
bottom: parent.bottom
96-
bottomMargin: 8
97-
right: parent.right
98-
rightMargin: 8
99-
}
100-
contentItem: Loader {
101-
active: !root.strongInteractive && root.actions.length > 0 && root.hovered
102-
sourceComponent: NotifyAction {
103-
actions: root.actions
104-
onActionInvoked: function (actionId) {
105-
root.actionInvoked(actionId)
106-
}
107-
}
108-
}
109-
}
110-
11190
contentItem: RowLayout {
11291
spacing: 0
11392
Binding {
@@ -230,7 +209,7 @@ NotifyItem {
230209
}
231210

232211
Loader {
233-
active: root.strongInteractive && root.actions.length > 0
212+
active: root.actions.length > 0
234213
visible: active
235214
Layout.alignment: Qt.AlignRight | Qt.AlignBottom
236215
sourceComponent: NotifyAction {

0 commit comments

Comments
 (0)