Merge lp:~unity-team/unity/fix-lp-998752-stable into lp:unity/5.0

Proposed by Omer Akram
Status: Merged
Approved by: Ɓukasz Zemczak
Approved revision: no longer in the source branch.
Merged at revision: 2398
Proposed branch: lp:~unity-team/unity/fix-lp-998752-stable
Merge into: lp:unity/5.0
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/LensBar.cpp (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity/fix-lp-998752-stable
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Tim Penhey (community) Approve
Review via email: mp+119486@code.launchpad.net

Commit message

Fix lensbar indicator to not appear if using alt-f2. thx Nicolas

Description of the change

Fix lensbar indicator to not appear if using alt-f2. thx Nicolas

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1058/console reported an error when processing this lp:~unity-team/unity/fix-lp-998752-stable branch.
Not merging it.

Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1069/console reported an error when processing this lp:~unity-team/unity/fix-lp-998752-stable branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/LensBar.cpp'
2--- plugins/unityshell/src/LensBar.cpp 2012-04-16 22:44:30 +0000
3+++ plugins/unityshell/src/LensBar.cpp 2012-08-14 08:42:25 +0000
4@@ -131,7 +131,7 @@
5
6 for (auto icon: icons_)
7 {
8- if (icon->active)
9+ if (icon->active && icon->IsVisible())
10 {
11 nux::Geometry const& geo = icon->GetGeometry();
12 int middle = geo.x + geo.width/2;

Subscribers

People subscribed via source and target branches

to all changes: