diff options
| author | Gord Allott <gord.allott@canonical.com> | 2010-09-22 14:49:14 +0100 |
|---|---|---|
| committer | Gord Allott <gord.allott@canonical.com> | 2010-09-22 14:49:14 +0100 |
| commit | 2adea98f009a1755799022d372b6a25a90b26577 (patch) | |
| tree | 834f4bf50513a1e3bf1ba65ee6eece70ed678abd /unity-private/launcher | |
| parent | a58fba5d32b7445f1a80f313ccc8b6f36bcae5e4 (diff) | |
stops drag events from affecting special launcher icons such as places, also stops you dragging past those icons
(bzr r529.1.1)
Diffstat (limited to 'unity-private/launcher')
| -rw-r--r-- | unity-private/launcher/scroller-controller.vala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/unity-private/launcher/scroller-controller.vala b/unity-private/launcher/scroller-controller.vala index 833338dfa..380d14f87 100644 --- a/unity-private/launcher/scroller-controller.vala +++ b/unity-private/launcher/scroller-controller.vala @@ -82,7 +82,7 @@ namespace Unity.Launcher var childcontroller = get_controller_for_view (model[index]); if (childcontroller is ScrollerChildController) - { + { childcontroller.activate (); } else @@ -344,7 +344,6 @@ namespace Unity.Launcher { if (retcont is ScrollerChild) { - if (retcont.enable_close_state == true) { retcont.enable_close_state = false; @@ -370,6 +369,8 @@ namespace Unity.Launcher int model_index = view.get_model_index_at_y_pos_no_anim (y - 24, true); if (model_index < 0) return; + if (model[model_index].group_type != ScrollerChild.GroupType.APPLICATION) + return; //we have to check to see if we would still be over the index //if it was done animating |