Skip to content

fix: launchpad hide at dropEvent #938

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

fix: launchpad hide at dropEvent #938

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
18 changes: 17 additions & 1 deletion frame/popupwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,25 @@ void PopupWindow::mouseReleaseEvent(QMouseEvent *event)
{
QQuickWindowQmlImpl::mouseReleaseEvent(event);
auto rect = geometry();
if (!rect.contains(event->globalPosition().toPoint())) {
if (!m_dragging && !rect.contains(event->globalPosition().toPoint()) && type() == Qt::Popup) {
close();
}
m_dragging = false;
m_pressing = false;
}

void PopupWindow::mousePressEvent(QMouseEvent *event)
{
m_pressing = true;
return QQuickWindowQmlImpl::mousePressEvent(event);
}

void PopupWindow::mouseMoveEvent(QMouseEvent *event)
{
if (m_pressing) {
m_dragging = true;
}
return QQuickWindowQmlImpl::mouseMoveEvent(event);
}

DS_END_NAMESPACE
6 changes: 6 additions & 0 deletions frame/popupwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@ class PopupWindow : public QQuickWindowQmlImpl

protected:
void mouseReleaseEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;

private:
bool m_dragging;
bool m_pressing;
};
DS_END_NAMESPACE
Loading