Merge lp:~gordallott/unity/remove-blur-on-hover into lp:unity

Proposed by Gord Allott
Status: Merged
Approved by: Neil J. Patel
Approved revision: no longer in the source branch.
Merged at revision: 1669
Proposed branch: lp:~gordallott/unity/remove-blur-on-hover
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
2 files modified
plugins/unityshell/src/ResultRendererHorizontalTile.cpp (+1/-1)
plugins/unityshell/src/ResultRendererTile.cpp (+1/-1)
To merge this branch: bzr merge lp:~gordallott/unity/remove-blur-on-hover
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+77525@code.launchpad.net

Description of the change

removes the blur on hover by checking the state before drawing

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/ResultRendererHorizontalTile.cpp'
2--- plugins/unityshell/src/ResultRendererHorizontalTile.cpp 2011-09-29 09:20:41 +0000
3+++ plugins/unityshell/src/ResultRendererHorizontalTile.cpp 2011-09-29 13:22:17 +0000
4@@ -87,7 +87,7 @@
5 int icon_top_side = geometry.y + ((geometry.height - style->GetTileIconSize()) / 2);
6
7
8- if (container->blurred_icon)
9+ if (container->blurred_icon && state == ResultRendererState::RESULT_RENDERER_NORMAL)
10 {
11 GfxContext.QRP_1Tex(icon_left_hand_side - 5 - x_offset,
12 icon_top_side - 5 - y_offset,
13
14=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
15--- plugins/unityshell/src/ResultRendererTile.cpp 2011-09-29 09:20:41 +0000
16+++ plugins/unityshell/src/ResultRendererTile.cpp 2011-09-29 13:22:17 +0000
17@@ -105,7 +105,7 @@
18 int icon_top_side = geometry.y + padding;
19
20
21- if (container->blurred_icon)
22+ if (container->blurred_icon && state == ResultRendererState::RESULT_RENDERER_NORMAL)
23 {
24 GfxContext.QRP_1Tex(icon_left_hand_side - 5 - x_offset,
25 icon_top_side - 5 - y_offset,