Unity

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

  1. fix-728949
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Merged at revision: 1194
Proposed branch: lp:~azzar1/unity/fix-728949
Merge into: lp:unity
Diff against target: 13 lines (+3/-0)
1 file modified
src/Launcher.cpp (+3/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-728949
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+61862@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Launcher.cpp'
2--- src/Launcher.cpp 2011-05-17 04:06:05 +0000
3+++ src/Launcher.cpp 2011-05-21 17:19:22 +0000
4@@ -1503,6 +1503,9 @@
5 float present_progress = IconPresentProgress (*it, current);
6 folding_threshold -= CLAMP (sum - launcher_height, 0.0f, height * magic_constant) * (folding_constant + (1.0f - folding_constant) * present_progress);
7 }
8+
9+ if (sum - _space_between_icons <= launcher_height)
10+ folding_threshold = launcher_height;
11
12 // this happens on hover, basically its a flag and a value in one, we translate this into a dnd offset
13 if (_enter_y != 0 && _enter_y + _icon_size / 2 > folding_threshold)