Fixes

2 files changed, 17 insertions, 11 deletions

diff --git a/sugar/canvas/SnowflakeLayout.py b/sugar/canvas/SnowflakeLayout.py
index b8c6a3d..611ecaa 100644
--- a/sugar/canvas/SnowflakeLayout.py
+++ b/sugar/canvas/SnowflakeLayout.py
@@ -6,12 +6,11 @@ class SnowflakeLayout:
 	_BASE_RADIUS = 65
 	_CHILDREN_FACTOR = 1
 	_FLAKE_DISTANCE = 6
-	_BORDER = 20
 
 	def __init__(self):
 		self._root = None
 		self._children = []
-		self._size = 0
+		self._r = 0
 
 	def set_root(self, icon):
 		self._root = icon
@@ -28,7 +27,7 @@ class SnowflakeLayout:
 		[width, height] = self._root.get_size_request()
 
 		matrix = cairo.Matrix(1, 0, 0, 1, 0, 0)
-		matrix.translate(self._cx, self._cy)
+		matrix.translate(self._cx - (width / 2), self._cy - (height / 2))
 		self._root.set_transform(matrix)
 
 	def _layout_child(self, child, index):
@@ -38,24 +37,31 @@ class SnowflakeLayout:
 
 		angle = 2 * math.pi / len(self._children) * index
 
-		x = self._cx + math.cos(angle) * r
-		y = self._cy + math.sin(angle) * r
+		[width, height] = child.get_size_request()
+		x = self._cx + math.cos(angle) * r - (width / 2)
+		y = self._cy + math.sin(angle) * r - (height / 2)
 
 		matrix = cairo.Matrix(1, 0, 0, 1, 0, 0)
 		matrix.translate(x, y)
 		child.set_transform(matrix)
 
 	def get_size(self):
-		return self._size
+		max_child_size = 0
+		for child in self._children:
+			[width, height] = child.get_size_request()
+			max_child_size = max (max_child_size, width)
+			max_child_size = max (max_child_size, height)
+
+		return self._r * 2 + max_child_size + \
+			   SnowflakeLayout._FLAKE_DISTANCE * 2
 
 	def _layout(self):
 		self._r = SnowflakeLayout._BASE_RADIUS + \
 				  SnowflakeLayout._CHILDREN_FACTOR * len(self._children)
-		self._size = self._r * 2 + SnowflakeLayout._BORDER + \
-					 SnowflakeLayout._FLAKE_DISTANCE * 2 
 
-		self._cx = self._size / 2
-		self._cy = self._size / 2
+		size = self.get_size()
+		self._cx = size / 2
+		self._cy = size / 2
 
 		self._layout_root()
 
diff --git a/tests/test-snowflake.py b/tests/test-snowflake.py
index 4fd840d..eeed46d 100755
--- a/tests/test-snowflake.py
+++ b/tests/test-snowflake.py
@@ -22,7 +22,7 @@ from sugar.canvas.Grid import Grid
 
 def _create_snowflake(group, children):
 	color = IconColor.IconColor()
-	icon = IconItem(size=60, color=color,
+	icon = IconItem(size=40, color=color,
 					icon_name='activity-groupchat')
 	group.add_child(icon)
 	layout.set_root(icon)