summaryrefslogtreecommitdiff
diff options
-rw-r--r--unity-private/launcher/scroller-controller.vala1
-rw-r--r--unity-private/launcher/scroller-view.vala13
2 files changed, 3 insertions, 11 deletions
diff --git a/unity-private/launcher/scroller-controller.vala b/unity-private/launcher/scroller-controller.vala
index c338d7ba3..428ea845c 100644
--- a/unity-private/launcher/scroller-controller.vala
+++ b/unity-private/launcher/scroller-controller.vala
@@ -126,6 +126,7 @@ namespace Unity.Launcher
else
{
ScrollerChild child = new ScrollerChild ();
+ child.group_type = ScrollerChild.GroupType.APPLICATION;
controller = new ApplicationController (null, child);
(controller as ApplicationController).attach_application (app);
if (app.user_visible ())
diff --git a/unity-private/launcher/scroller-view.vala b/unity-private/launcher/scroller-view.vala
index 2ee0f093d..ce7f8916a 100644
--- a/unity-private/launcher/scroller-view.vala
+++ b/unity-private/launcher/scroller-view.vala
@@ -267,7 +267,7 @@ namespace Unity.Launcher
if (assume_on_launcher)
x = 25;
- Clutter.Actor picked_actor = (get_stage () as Clutter.Stage).get_actor_at_pos (Clutter.PickMode.REACTIVE, (int)x, (int)y);
+ Clutter.Actor picked_actor = (get_stage () as Clutter.Stage).get_actor_at_pos (Clutter.PickMode.ALL, (int)x, (int)y);
foreach (Clutter.Actor actor in model)
@@ -1585,16 +1585,7 @@ namespace Unity.Launcher
public override void pick (Clutter.Color color)
{
base.pick (color);
- for (int index = draw_btf.size-1; index >= 0; index--)
- {
- ScrollerChild child = draw_btf[index];
- if (child is ScrollerChild && child.opacity > 0 && !child.do_not_render)
- {
- (child as ScrollerChild).paint ();
- }
- }
-
- foreach (ScrollerChild child in draw_ftb)
+ foreach (ScrollerChild child in model)
{
if (child is ScrollerChild && child.opacity > 0 && !child.do_not_render)
{