Merge lp://qastaging/~fboucault/unity-2d/windowimageprovider_remove_timestamp_hack into lp://qastaging/unity-2d

Proposed by Florian Boucault
Status: Merged
Approved by: Gerry Boland
Approved revision: 810
Merged at revision: 823
Proposed branch: lp://qastaging/~fboucault/unity-2d/windowimageprovider_remove_timestamp_hack
Merge into: lp://qastaging/unity-2d
Diff against target: 121 lines (+9/-44)
5 files modified
libunity-2d-private/src/screeninfo.cpp (+0/-8)
libunity-2d-private/src/screeninfo.h (+0/-5)
libunity-2d-private/src/windowimageprovider.cpp (+4/-9)
places/dash.qml (+2/-11)
spread/Window.qml (+3/-11)
To merge this branch: bzr merge lp://qastaging/~fboucault/unity-2d/windowimageprovider_remove_timestamp_hack
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Lohith D Shivamurthy (community) code Needs Fixing
Review via email: mp+84662@code.qastaging.launchpad.net

Description of the change

[dash & spread] Do not use a timestamp to make sure the window screenshots are
refreshed but instead make use of the 'cache' property of the Image QML element
recently introduced in Qt Quick 1.1

Removed unused ScreenInfo::currentTime()

To post a comment you must log in.
Revision history for this message
Lohith D Shivamurthy (dyams) wrote :

Two issues I noticed

1) Is it not a good time to remove this too?
<code >QString ScreenInfo::currentTime() { ... } </code>

2) The comment needs to be fixed. windowimageprovider.cpp line#104
Current : /* After doing this, split the rest of the id on the character "|". The first
            part is the window ID of the decorations, the latter of the actual content. */
Updated : /* Split the id on the character "|". The first part is the window ID of the decorations and the latter is the actual content. */

Would it be possible to address these two issues? Please let me know.

review: Needs Fixing (code)
808. By Florian Boucault

Removed now unused ScreenInfo::currentTime()

809. By Florian Boucault

Fixed comment wording in WindowImageProvider.

Revision history for this message
Florian Boucault (fboucault) wrote :

Thanks a lot for this review Lohith. I believed I have now addressed the 2 issues.

Revision history for this message
Gerry Boland (gerboland) wrote :

Just a minor thing:

QString windowIds = id;

there no need for the copy now. Otherwise is good.

Revision history for this message
Gerry Boland (gerboland) wrote :

This is breaking the spread for me. Launch spread (works ok), exit it, then launch it again. It fails to work, errors like:

unity-2d-spread: [WARNING] file:///home/gerry/dev/windowimageprovider_remove_timestamp_hack//spread/Window.qml:64:5: QML Image: Failed to get image from provider: image://window/17184478|23068809

review: Needs Fixing
Revision history for this message
Florian Boucault (fboucault) wrote :

> Just a minor thing:
>
> QString windowIds = id;
>
> there no need for the copy now. Otherwise is good.

Yeah, I kept it in order to minimize the diff.

Revision history for this message
Florian Boucault (fboucault) wrote :

> This is breaking the spread for me. Launch spread (works ok), exit it, then
> launch it again. It fails to work, errors like:
>
> unity-2d-spread: [WARNING] file:///home/gerry/dev/windowimageprovider_remove_t
> imestamp_hack//spread/Window.qml:64:5: QML Image: Failed to get image from
> provider: image://window/17184478|23068809

It sounds like it is unrelated to that patch. I will do more stress testing.

810. By Florian Boucault

Merged lp:unity-2d

Revision history for this message
Florian Boucault (fboucault) wrote :

Gerry, I do not experience this issue unless:
- metacity's compositing is disabled
- a window is on another workspace and metacity's capture before unmap is disabled
- a window is minimized and metacity's capture before unmap is disabled

Whether or not the patch in this MR is applied you should experience this.

Revision history for this message
Gerry Boland (gerboland) wrote :

Yes on further investigation I believe the issue I saw is unrelated to this patch. Hence I approve this. Thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches