Skip to content

fix: unable to hide popup click twice on treeland #945

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 9, 2024
Merged

fix: unable to hide popup click twice on treeland #945

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
2 changes: 1 addition & 1 deletion frame/popupwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void PopupWindow::mouseReleaseEvent(QMouseEvent *event)
QQuickWindowQmlImpl::mouseReleaseEvent(event);
auto rect = geometry();
if (!m_dragging && !rect.contains(event->globalPosition().toPoint()) && type() == Qt::Popup) {
close();
QMetaObject::invokeMethod(this, &QWindow::close, Qt::QueuedConnection);
}
m_dragging = false;
m_pressing = false;
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ AppletItemButton {
contentItem: Item {
id: pluginItem
property var plugin: DockCompositor.findSurface(model.surfaceId)
implicitHeight: plugin.height
implicitWidth: plugin.width
implicitHeight: plugin?.height
implicitWidth: plugin?.width

property var itemGlobalPoint: {
var a = pluginItem
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/quickpanel/PluginItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Control {
anchors.fill: parent
dragItem: root
dragTextData: `${root.pluginId}::${root.itemKey}`
fallbackIconSize: traySurface ? traySurface.size : Qt.size(16, 16)
fallbackIconSize: traySurface ? Qt.size(traySurface.width, traySurface.height) : Qt.size(16, 16)
enabledDrag: canDrag
}

Expand Down
Loading