Merge lp:~unity-team/unity/unity.fix-unreactive-tiles into lp:unity

Proposed by Gord Allott on 2010-09-01
Status: Merged
Approved by: Mirco Müller on 2010-09-02
Approved revision: 477
Merged at revision: 477
Proposed branch: lp:~unity-team/unity/unity.fix-unreactive-tiles
Merge into: lp:unity
Diff against target: 33 lines (+2/-10)
2 files modified
unity-private/launcher/scroller-controller.vala (+1/-0)
unity-private/launcher/scroller-view.vala (+1/-10)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-unreactive-tiles
Reviewer Review Type Date Requested Status
Mirco Müller (community) 2010-09-01 Approve on 2010-09-02
Review via email: mp+34293@code.launchpad.net

Description of the Change

fixes lp:623953

quick summery, icons that are loaded after unity starts are un-reactive, this fixes that

To post a comment you must log in.
Mirco Müller (macslow) wrote :

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-private/launcher/scroller-controller.vala'
2--- unity-private/launcher/scroller-controller.vala 2010-08-24 15:13:35 +0000
3+++ unity-private/launcher/scroller-controller.vala 2010-09-01 14:49:56 +0000
4@@ -126,6 +126,7 @@
5 else
6 {
7 ScrollerChild child = new ScrollerChild ();
8+ child.group_type = ScrollerChild.GroupType.APPLICATION;
9 controller = new ApplicationController (null, child);
10 (controller as ApplicationController).attach_application (app);
11 if (app.user_visible ())
12
13=== modified file 'unity-private/launcher/scroller-view.vala'
14--- unity-private/launcher/scroller-view.vala 2010-08-27 11:37:45 +0000
15+++ unity-private/launcher/scroller-view.vala 2010-09-01 14:49:56 +0000
16@@ -1585,16 +1585,7 @@
17 public override void pick (Clutter.Color color)
18 {
19 base.pick (color);
20- for (int index = draw_btf.size-1; index >= 0; index--)
21- {
22- ScrollerChild child = draw_btf[index];
23- if (child is ScrollerChild && child.opacity > 0 && !child.do_not_render)
24- {
25- (child as ScrollerChild).paint ();
26- }
27- }
28-
29- foreach (ScrollerChild child in draw_ftb)
30+ foreach (ScrollerChild child in model)
31 {
32 if (child is ScrollerChild && child.opacity > 0 && !child.do_not_render)
33 {