Skip to content

fix: drop strongInteractive of action for notification #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Dec 10, 2024
Merged

fix: drop strongInteractive of action for notification #953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 1 addition & 22 deletions panels/notification/plugin/NotifyItemContent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import org.deepin.ds.notification
NotifyItem {
id: root

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

Expand Down Expand Up @@ -89,25 +87,6 @@ NotifyItem {
}
}

Control {
id: actionPlaceHolder
anchors {
bottom: parent.bottom
bottomMargin: 8
right: parent.right
rightMargin: 8
}
contentItem: Loader {
active: !root.strongInteractive && root.actions.length > 0 && root.hovered
sourceComponent: NotifyAction {
actions: root.actions
onActionInvoked: function (actionId) {
root.actionInvoked(actionId)
}
}
}
}

contentItem: RowLayout {
spacing: 0
Binding {
Expand Down Expand Up @@ -230,7 +209,7 @@ NotifyItem {
}

Loader {
active: root.strongInteractive && root.actions.length > 0
active: root.actions.length > 0
visible: active
Layout.alignment: Qt.AlignRight | Qt.AlignBottom
sourceComponent: NotifyAction {
Expand Down
Loading