Skip to content

fix: plugin drag and drop animation is slow #686

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
Aug 13, 2024
Merged

fix: plugin drag and drop animation is slow #686

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions panels/dock/tray/package/ActionToggleCollapseDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ AppletItemButton {
padding: itemPadding

onClicked: {
DDT.TraySortOrderModel.isCollapsing = true
DDT.TraySortOrderModel.collapsed = !DDT.TraySortOrderModel.collapsed
toolTip.close()
}
Expand Down
10 changes: 7 additions & 3 deletions panels/dock/tray/package/TrayItemPositioner.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ Control {
y: visualPosition.y
Behavior on x {
enabled: isHorizontal
NumberAnimation { duration: 200; easing.type: collapsed ? Easing.OutQuad : Easing.InQuad }
NumberAnimation { duration: 200; easing.type: collapsed || !DDT.TraySortOrderModel.isCollapsing ? Easing.OutQuad : Easing.InQuad }
}
Behavior on y {
enabled: !isHorizontal
NumberAnimation { duration: 200; easing.type: collapsed ? Easing.OutQuad : Easing.InQuad }
NumberAnimation { duration: 200; easing.type: collapsed || !DDT.TraySortOrderModel.isCollapsing ? Easing.OutQuad : Easing.InQuad }
}
states: [
State {
Expand All @@ -53,10 +53,14 @@ Control {
SequentialAnimation {
NumberAnimation { properties: "opacity,scale"; easing.type: Easing.OutQuad; duration: 200 }
PropertyAction { target: root; property: "visible"; value: false }
PropertyAction { target: DDT.TraySortOrderModel; property: "isCollapsing"; value: false }
}
},
Transition {
NumberAnimation { properties: "opacity,scale"; easing.type: Easing.InQuad; duration: 200 }
SequentialAnimation {
NumberAnimation { properties: "opacity,scale"; easing.type: Easing.InQuad; duration: 200 }
PropertyAction { target: DDT.TraySortOrderModel; property: "isCollapsing"; value: false }
}
}
]
}
3 changes: 3 additions & 0 deletions panels/dock/tray/traysortordermodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class TraySortOrderModel : public QStandardItemModel

Q_PROPERTY(int visualItemCount MEMBER m_visualItemCount NOTIFY visualItemCountChanged)
Q_PROPERTY(bool collapsed MEMBER m_collapsed NOTIFY collapsedChanged)
Q_PROPERTY(bool isCollapsing MEMBER m_isCollapsing NOTIFY isCollapsingChanged)
Q_PROPERTY(bool actionsAlwaysVisible MEMBER m_actionsAlwaysVisible NOTIFY actionsAlwaysVisibleChanged)
Q_PROPERTY(QList<QVariantMap> availableSurfaces MEMBER m_availableSurfaces NOTIFY availableSurfacesChanged)
public:
Expand Down Expand Up @@ -61,13 +62,15 @@ class TraySortOrderModel : public QStandardItemModel

signals:
void collapsedChanged(bool);
void isCollapsingChanged(bool);
void actionsAlwaysVisibleChanged(bool);
void visualItemCountChanged(int);
void availableSurfacesChanged(const QList<QVariantMap> &);

private:
int m_visualItemCount = 0;
bool m_collapsed = false;
bool m_isCollapsing = false;
bool m_actionsAlwaysVisible = false;
std::unique_ptr<Dtk::Core::DConfig> m_dconfig;
// this is for the plugins that currently available.
Expand Down