Unity

Merge lp:~townsend/unity/tweak_icon_glow into lp:unity

  1. tweak_icon_glow
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3274
Proposed branch: lp:~townsend/unity/tweak_icon_glow
Merge into: lp:unity
Diff against target: 30 lines (+3/-3)
1 file modified
unity-shared/IconRenderer.cpp (+3/-3)
To merge this branch: bzr merge lp:~townsend/unity/tweak_icon_glow
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+156959@code.launchpad.net

Commit message

Tweak the glow around icons for urgent apps.
Also tweak the keyboard nav icon glow as well as the system icon.

Description of the change

When putting in the changes for bug #1157866, the urgent app icon edge illumination was a bit too high. This MP tones that down and also tweaks the edge illumination for keyboard nav.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Look nice to me :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/IconRenderer.cpp'
2--- unity-shared/IconRenderer.cpp 2013-03-21 14:33:45 +0000
3+++ unity-shared/IconRenderer.cpp 2013-04-03 19:52:57 +0000
4@@ -177,7 +177,7 @@
5 END");
6
7 const float edge_illumination_multiplier = 2.0f;
8-const float glow_multiplier = 3.0f;
9+const float glow_multiplier = 2.3f;
10 } // anonymous namespace
11
12 // The local namespace is purely for namespacing the file local variables below.
13@@ -485,7 +485,7 @@
14 colorify = nux::color::White;
15 background_tile_colorify = nux::color::White;
16 backlight_intensity = 0.95f;
17- glow_intensity = glow_intensity + 1.0f;
18+ glow_intensity = 1.3f;
19 shadow_intensity = 0.0f;
20
21 background = textures_->icon_selected_background[size];
22@@ -512,7 +512,7 @@
23 {
24 // 0.9f is BACKLIGHT_STRENGTH in Launcher.cpp
25 backlight_intensity = (arg.keyboard_nav_hl) ? 0.95f : 0.9f;
26- glow_intensity = glow_intensity + ((arg.keyboard_nav_hl) ? 1.0f : 0.0f) ;
27+ glow_intensity = (arg.keyboard_nav_hl) ? glow_intensity : 0.0f ;
28 }
29
30 // draw shadow