unity-2d

Merge lp://qastaging/~osomon/unity-2d/offscreenQuicklists into lp://qastaging/unity-2d/3.0

offscreenQuicklists
Merge into natty

Proposed by Olivier Tilloy on 2011-03-03

Status:

Merged

Approved by:

Aurélien Gâteau on 2011-03-03

Approved revision:

426

Merged at revision:

424

Proposed branch:

lp://qastaging/~osomon/unity-2d/offscreenQuicklists

Merge into:

lp://qastaging/unity-2d/3.0

Diff against target:

164 lines (+61/-8)

3 files modified

launcher/UnityApplications/launchermenu.cpp (+49/-6)
launcher/UnityApplications/launchermenu.h (+10/-0)
launcher/launchermenu.css (+2/-2)

To merge this branch:

bzr merge lp://qastaging/~osomon/unity-2d/offscreenQuicklists

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Aurélien Gâteau (community)		2011-03-03	Approve on 2011-03-03
Review via email: mp+52064@code.qastaging.launchpad.net

Commit message

[launcher] Adjust the position of quicklists so that they never get offscreen.

Description of the change

Note to the reviewer: when testing quicklists, there are two different code paths to test: compositing enabled and compositing disabled. With metacity, it’s simply a matter of changing the value of the GConf key at /apps/metacity/general/compositing_manager.

Also note that the launcher is not aware of live changes (it doesn’t get notified if the window manager suddenly decides to support compositing, this is a known issue documented in the code), so it needs to be restarted to test those two code paths.

Revision history for this message

Aurélien Gâteau (agateau) wrote on 2011-03-03:

# Functional

Works well, except for a tiny bug in composited mode: the arrow and the tooltip seems to overlap. This screenshot should make it clearer.

http://wstaw.org/m/2011/03/03/unity-2d-launcher-tooltip_.png

I think this can be fixed by calling painter.setCompositionMode(QPainter::Source) before painting the arrow.

# Code

You can make m_arrow a QPixmap instead of a QPixmap*. It is not QObject-based and is implicitly shared so it is more common to use QPixmaps as values.

Instead of adding the m_maskNeedsUpdate, would it be possible to simply call updateMask() in setFolded()? That would simplify the code a bit.

review: Needs Fixing

lp://qastaging/~osomon/unity-2d/offscreenQuicklists updated on 2011-03-03

424. By Olivier Tilloy on 2011-03-03: Paint the arrow over the quicklist, don’t blend pixels.
425. By Olivier Tilloy on 2011-03-03: Make m_arrow a QPixmap instead of a QPixmap*.
426. By Olivier Tilloy on 2011-03-03: Directly update the mask when the menu has moved.