Repository navigation
Keep drag-picture grabs alive when delegates disappear #196
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.
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
Open
k-kostin
wants to merge
2
commits into
omacom:main
Choose a base branch
from
k-kostin:codex/fix-hover-grab-lifetime
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #include "dragpicture.h" | ||
|
|
||
| #include <QQuickItem> | ||
| #include <QQuickWindow> | ||
|
|
||
| bool DragPicture::capture(QQuickItem *item) { | ||
| if (!item) | ||
| return false; | ||
| auto grab = item->grabToImage(); | ||
| if (!grab) | ||
| return false; | ||
| // A replaced or discarded delegate can let go between Qt's setup and | ||
| // render callbacks. Keep that frame's work alive until it has completed; | ||
| // queue the release after ready returns. The window also releases it on | ||
| // teardown, after its render thread has stopped. | ||
| connect(grab.data(), &QQuickItemGrabResult::ready, item->window(), [grab] {}, | ||
| Qt::ConnectionType(Qt::QueuedConnection | Qt::SingleShotConnection)); | ||
| m_source = item; | ||
| m_grab = grab; | ||
| connect(grab.data(), &QQuickItemGrabResult::ready, this, [this, request = grab.data()] { | ||
| if (m_grab.data() == request && m_source) | ||
| emit ready(); | ||
| }); | ||
| return true; | ||
| } | ||
|
|
||
| QUrl DragPicture::url() const { | ||
| return m_grab ? m_grab->url() : QUrl(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #pragma once | ||
|
|
||
| #include <QObject> | ||
| #include <QPointer> | ||
| #include <QQuickItemGrabResult> | ||
| #include <QSharedPointer> | ||
| #include <QUrl> | ||
|
|
||
| class QQuickItem; | ||
|
|
||
| // A drag's picture, taken ahead of time. The C++ grab API keeps a render | ||
| // callback's result alive even if its item disappears while it is running. | ||
| class DragPicture : public QObject { | ||
| Q_OBJECT | ||
| Q_PROPERTY(QUrl url READ url NOTIFY ready) | ||
|
|
||
| public: | ||
| explicit DragPicture(QObject *parent = nullptr) : QObject(parent) {} | ||
| Q_INVOKABLE bool capture(QQuickItem *item); | ||
| QUrl url() const; | ||
|
|
||
| signals: | ||
| void ready(); | ||
|
|
||
| private: | ||
| QPointer<QQuickItem> m_source; | ||
| QSharedPointer<QQuickItemGrabResult> m_grab; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
picturealive, so itsm_grabstill holds the pending capture. The other branch deletes the whole window. Neither covers scrolling a delegate away, where both the source andDragPicturedisappear while the window keeps rendering—the case that needs the new window-held reference.Add a branch that deletes both objects after
capture(), leaves the window open, and waits for another frame. This would cover the ownership path this fix adds.Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!