Adapt spread layout to hippo

1 files changed, 44 insertions, 34 deletions

diff --git a/sugar/graphics/spreadlayout.py b/sugar/graphics/spreadlayout.py
index 48338c6..0ce70ff 100644
--- a/sugar/graphics/spreadlayout.py
+++ b/sugar/graphics/spreadlayout.py
@@ -3,74 +3,84 @@ import math
 
 import cairo
 
-class SpreadLayout:
-	DISTANCE_THRESHOLD = 120.0
+_DISTANCE_THRESHOLD = 120.0
 
+class SpreadLayout:
 	def __init__(self):
 		pass
 
-	def _get_distance(self, icon1, icon2):
-		[icon1_x, icon1_y] = self._constraints[icon1]
-		[icon2_x, icon2_y] = self._constraints[icon2]
+	def _get_distance(self, box, icon1, icon2):
+		[icon1_x, icon1_y] = box.get_position(icon1)
+		[icon2_x, icon2_y] = box.get_position(icon2)
 
 		a = icon1_x - icon2_x
 		b = icon1_y - icon2_y
 
 		return math.sqrt(a * a  + b * b)
 
-	def _get_repulsion(self, icon1, icon2):
-		[icon1_x, icon1_y] = self._constraints[icon1]
-		[icon2_x, icon2_y] = self._constraints[icon2]
+	def _get_repulsion(self, box, icon1, icon2):
+		[icon1_x, icon1_y] = box.get_position(icon1)
+		[icon2_x, icon2_y] = box.get_position(icon2)
 
 		f_x = icon1_x - icon2_x
 		f_y = icon1_y - icon2_y
 
 		return [f_x, f_y]
 
-	def _spread_icons(self):
-		self._stable = True
+	def _clamp_position(self, box, icon, x, y):
+		x = max(0, x)
+		y = max(0, y)
+
+		[item_w, item_h] = icon.get_allocation()
+		[box_w, box_h] = box.get_allocation()
+
+		x = min(box_w - item_w, x)
+		y = min(box_h - item_h, y)
+
+		return [x, y]
 
-		for icon1 in self._icons:
+	def _spread_icons(self, box):
+		stable = True
+
+		for icon1 in box.get_children():
 			vx = 0
 			vy = 0
 
-			[x, y] = self._constraints[icon1]
+			[x, y] = box.get_position(icon1)
 
-			for icon2 in self._icons:
+			for icon2 in box.get_children():
 				if icon1 != icon2:
-					distance = self._get_distance(icon1, icon2)
-					if distance <= IconLayout.DISTANCE_THRESHOLD:
-						self._stable = False
-						[f_x, f_y] = self._get_repulsion(icon1, icon2)
+					distance = self._get_distance(box, icon1, icon2)
+					if distance <= _DISTANCE_THRESHOLD:
+						stable = False
+						[f_x, f_y] = self._get_repulsion(box, icon1, icon2)
 						vx += f_x
 						vy += f_y
 
 			new_x = x + vx
 			new_y = y + vy
 
-			new_x = max(self._x1, new_x)
-			new_y = max(self._y1, new_y)
-
-			[width, height] = icon1.get_size_request()
-			new_x = min(self._x2 - width, new_x)
-			new_y = min(self._y2 - height, new_y)
+			[new_x, new_y] = self._clamp_position(box, icon1, new_x, new_y)
 
-			self._constraints[icon1] = [new_x, new_y]
+			box.move(icon1, new_x, new_y)
 
-			matrix = cairo.Matrix(1, 0, 0, 1, 0, 0)
-			matrix.translate(new_x - (width / 2), new_y - (height / 2))
-			icon1.set_transform(matrix)
-
-	def update(self):
-		tries = 10
-		self._spread_icons()
-		while not self._stable and tries > 0:
-			self._spread_icons()
-			tries -= 1
+			return stable
 
 	def layout(self, box):
 		[width, height] = box.get_allocation()
+
 		for item in box.get_children():
+			[item_w, item_h] = item.get_allocation()
+
 			x = int(random.random() * width)
 			y = int(random.random() * height)
+
+			[x, y] = self._clamp_position(box, item, x, y)
+
 			box.move(item, x, y)
+
+		tries = 10
+		stable = self._spread_icons(box)
+		while not stable and tries > 0:
+			stable = self._spread_icons(box)
+			tries -= 1