Unity

Merge lp://qastaging/~jassmith/unity/unity.redraw-on-resume into lp://qastaging/unity

unity.redraw-on-resume
Merge into trunk

Proposed by Jason Smith on 2012-03-05

Status:

Merged

Approved by:

Tim Penhey on 2012-04-02

Approved revision:

no longer in the source branch.

Merged at revision:

2205

Proposed branch:

lp://qastaging/~jassmith/unity/unity.redraw-on-resume

Merge into:

lp://qastaging/unity

Diff against target:

83 lines (+25/-0)

4 files modified

manual-tests/NvResumeFromSuspend.txt (+11/-0)
plugins/unityshell/src/LauncherController.cpp (+6/-0)
plugins/unityshell/src/UScreen.cpp (+3/-0)
plugins/unityshell/src/UScreen.h (+5/-0)

To merge this branch:

bzr merge lp://qastaging/~jassmith/unity/unity.redraw-on-resume

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Tim Penhey (community)		Approve on 2012-04-01
Marco Trevisan (Treviño)	2012-03-05	Needs Information on 2012-03-06
Gord Allott	2012-03-05	Pending
Review via email: mp+95945@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-03-04.

Commit message

Repaint the launcher on resume from suspend.

Description of the change

== The Problem ==
Unity paints a corrupted texture on screen after resume from suspend until it is redraw on Nvidia based system

== The Solutins ==
Repaint the launcher on resume from suspend (this seems to be the problem child)

== Testing ==
Manual test included. Automatic testing not really reasonable due to the nature of the issue (driver hack-a-round)

Revision history for this message

Gord Allott (gordallott) wrote on 2012-03-05: Posted in a previous version of this proposal

review: Approve

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2012-03-06:

Why not using glib::DBusProxy ?
It would allow a cleaner implementation...

review: Needs Information

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2012-03-06:

Also, maybe we could just make this go in: https://code.launchpad.net/~smspillaz/unity/unity.half_fix_883836/+merge/85800

And integrate this change into that utility function (that I also had used for some panel stuff).

Revision history for this message

Omer Akram (om26er) wrote on 2012-03-25:

bump?

Revision history for this message

Tim Penhey (thumper) wrote on 2012-03-29:

Why add <gio/gio.h> ?

Instead of assigning, use reset:

proxy_.reset(new unity::glib::DBusProxy("org.freedesktop.UPower",
                                        "/org/freedesktop/UPower",
                                        "org.freedesktop.UPower",
                                        G_BUS_TYPE_SYSTEM);

Since you use a lambda function, and not sigc::mem_fun, this won't be automatically disconnected when the launcher controller dies. Could there be a situation where this occurs? Or not?

review: Needs Fixing

Revision history for this message

Tim Penhey (thumper) wrote on 2012-04-01:

Since this is a high priority bug, and a very slim defined race condition, I've just filed bug 971155 and we'll land this.

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-04-02:

No commit message specified.