Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Kaufmann <humitos@gmail.com>2012-12-10 21:34:57 (GMT)
committer Manuel QuiƱones <manuq@laptop.org>2012-12-17 21:40:14 (GMT)
commitd0a5c110a1e47710946f530deb6707788a86b85c (patch)
tree65bd59667eb90a4943ffce8cfb4b1fb070a81f4f
parentb496eecd315442ad050eb62610b6e5faed001436 (diff)
Avoid collisions with central buddy SL #3944
When a collision is detected: - if one of the icons is locked, just add the other (free) one to the collision list - if no one of them are locked, add both to the collision list This decrease the possibility to collide with locked icons because they (the icons who collide) are added to the collision list and then '__solve_collisions_cb' is called to try to re-organize them. Signed-off-by: Manuel Kaufmann <humitos@gmail.com> Acked-by: Manuel QuiƱones <manuq@laptop.org>
-rw-r--r--src/jarabe/desktop/grid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jarabe/desktop/grid.py b/src/jarabe/desktop/grid.py
index 9d6d820..83404e2 100644
--- a/src/jarabe/desktop/grid.py
+++ b/src/jarabe/desktop/grid.py
@@ -201,9 +201,9 @@ class Grid(SugarExt.Grid):
intersects_, intersection = Gdk.rectangle_intersect(
child_rect, self._child_rects[c])
if c != child and intersection.width > 0:
+ collision_found = True
if (c not in self._locked_children and
c not in self._collisions):
- collision_found = True
self._collisions.append(c)
if collision_found: