Merge lp:~azzar1/unity/fix-1043963 into lp:unity

Proposed by Andrea Azzarone on 2012-08-31
Status: Merged
Approved by: Andrea Azzarone on 2012-08-31
Approved revision: 2646
Merged at revision: 2646
Proposed branch: lp:~azzar1/unity/fix-1043963
Merge into: lp:unity
Diff against target: 22 lines (+12/-1)
1 file modified
launcher/Launcher.cpp (+12/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1043963
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) 2012-08-31 Approve on 2012-08-31
Review via email: mp+122212@code.launchpad.net

Commit message

Don't desat bfb/hud icon in DNDReset.

Description of the change

== Problem ==
HUD on empty desktop has dim icon.

== Fix ==
Fix DndReset function.

== Test ==
We have already ap test for it.
* test_hud_desaturates_launcher_icons
* test_hud_icon_is_shown

To post a comment you must log in.
lp:~azzar1/unity/fix-1043963 updated on 2012-08-31
2646. By Andrea Azzarone on 2012-08-31

Clean up.

Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/Launcher.cpp'
2--- launcher/Launcher.cpp 2012-08-30 22:24:06 +0000
3+++ launcher/Launcher.cpp 2012-08-31 09:08:19 +0000
4@@ -2601,7 +2601,18 @@
5
6 for (auto it : *_model)
7 {
8- it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, is_overlay_open);
9+ auto icon_type = it->GetIconType();
10+
11+ if (icon_type == AbstractLauncherIcon::IconType::HOME ||
12+ icon_type == AbstractLauncherIcon::IconType::HUD)
13+ {
14+ it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false);
15+ }
16+ else
17+ {
18+ it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, is_overlay_open && !_hovered);
19+ }
20+
21 it->SetQuirk(AbstractLauncherIcon::Quirk::PRESENTED, false);
22 }
23