Unity

Merge lp://qastaging/~3v1n0/unity/workspace-aware-launcher into lp://qastaging/unity

  1. workspace-aware-launcher
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 1856
Proposed branch: lp://qastaging/~3v1n0/unity/workspace-aware-launcher
Merge into: lp://qastaging/unity
Diff against target: 268 lines (+71/-71)
4 files modified
manual-tests/Launcher.txt (+40/-0)
plugins/unityshell/src/BamfLauncherIcon.cpp (+28/-65)
plugins/unityshell/src/BamfLauncherIcon.h (+1/-3)
plugins/unityshell/src/PluginAdapter.cpp (+2/-3)
To merge this branch: bzr merge lp://qastaging/~3v1n0/unity/workspace-aware-launcher
Reviewer Review Type Date Requested Status
Mirco Müller Pending
Review via email: mp+89429@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-01-20.

Description of the change

Make the launcher be aware of the window's workspace

Fixed another part of bug #689733 that we were missing, making the launcher to count only the windows in the current workspace when drawing the left "pips".

Also fixed the unity side of the bug #690143 to make the launcher to spread only the windows in the current workspace.

Manual tests included.

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote : Posted in a previous version of this proposal

Code looking good, manual test work as advertised... only complain I have is that the manual tests should be a bit more explicit, telling the test which applicaiton to use for testing this. Really a dull step-by-step instructions à la:

Preperation
-----------
1.) from clean session start/open a nautilus window on initial workspace
2.) goto right workspace, start two more instances of nautilus by middle-clicking twice on the nautilus-icon on the launcher
3.) goto bottom right workspace, start three more instances of nautilus by middle-clicking on the nautilus-icon on the launcher
4.) ...

Tests
-----
1.) Go to top right workspace select on of the nautilus windows
2.) Go to top left workspace open and focus a non-nautilus window (e.g. devhelp)
3.) Left click nautilus-icon on launcher -> outcome: you're moved to top right workspace to last focused nautilus-window (from step 1.))

etc.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

The prerequisite lp:~3v1n0/unity/manage-user-invisible-windows has not yet been merged into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

No proposals found for merge of lp:~3v1n0/unity/manage-user-invisible-windows into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/BamfLauncherIcon.cpp

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote : Posted in a previous version of this proposal

I've fixed the conflicts with current trunk, approving it for merge since nothing changed since last approval.

Revision history for this message
Unity Merger (unity-merger) wrote : Posted in a previous version of this proposal

No proposals found for merge of lp:~3v1n0/unity/manage-user-invisible-windows into lp:unity.

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.