Refactor the snowflake layout to use the new hippo layout managers.

Cleanup the logic.
Better test.
Make it internal.

shell/view/home/Makefile.am

@@ -8,4 +8,5 @@ sugar_PYTHON =			\
 	HomeWindow.py		\
 	MeshBox.py		\
 	MyIcon.py		\
+	snowflakelayout.py	\
 	transitionbox.py

shell/view/home/MeshBox.py

@@ -21,19 +21,20 @@ import gobject
 from gettext import gettext as _
 
 from sugar.graphics.spreadbox import SpreadBox
-from sugar.graphics.snowflakebox import SnowflakeBox
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics import color
 from sugar.graphics import xocolor
 from sugar.graphics import canvasicon
 from sugar.graphics import units
+from sugar import profile
+
 from model import accesspointmodel
 from model.devices.network import mesh
 from hardware import hardwaremanager
 from hardware import nmclient
 from view.BuddyIcon import BuddyIcon
 from view.pulsingicon import PulsingIcon
-from sugar import profile
+from view.home.snowflakelayout import SnowflakeLayout
 
 _ICON_NAME = 'device-network-wireless'
 
@@ -165,20 +166,22 @@ class MeshDeviceView(PulsingIcon):
                   color.HTMLColor(self._device_fill) ]
             ]
 
-class ActivityView(SnowflakeBox):
+class ActivityView(hippo.CanvasBox):
     def __init__(self, shell, model):
-        SnowflakeBox.__init__(self)
+        hippo.CanvasBox.__init__(self)
 
         self._shell = shell
         self._model = model
         self._icons = {}
 
+        self._layout = SnowflakeLayout()
+        self.set_layout(self._layout)
+
         self._icon = CanvasIcon(icon_name=model.get_icon_name(),
                           xo_color=model.get_color(), box_width=80)
         self._icon.connect('activated', self._clicked_cb)
         self._icon.set_tooltip(self._model.get_title())
-        self.append(self._icon, hippo.PACK_FIXED)
-        self.set_root(self._icon)
+        self._layout.add_center(self._icon)
 
     def _update_name(self):
         self.palette.set_primary_text(self._model.get_title())
@@ -188,7 +191,7 @@ class ActivityView(SnowflakeBox):
 
     def add_buddy_icon(self, key, icon):
         self._icons[key] = icon
-        self.append(icon, hippo.PACK_FIXED)
+        self._layout.add(icon)
 
     def remove_buddy_icon(self, key):
         icon = self._icons[key]

shell/view/home/snowflakelayout.py

@@ -0,0 +1,104 @@
+# Copyright (C) 2006-2007 Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import math
+
+import gobject
+import hippo
+
+from sugar.graphics import units
+
+_BASE_RADIUS = units.points_to_pixels(20)
+_CHILDREN_FACTOR = 1
+
+class SnowflakeLayout(gobject.GObject,hippo.CanvasLayout):
+    __gtype_name__ = 'SugarSnowflakeLayout'
+    def __init__(self):
+        hippo.CanvasBox.__init__(self)
+        self._nflakes = 0
+
+    def add(self, child):
+        self._box.append(child)
+
+        box_child = self._box.find_box_child(child)
+        box_child.is_center = False
+
+        self._nflakes += 1
+
+    def add_center(self, child):
+        self._box.append(child)
+        box_child = self._box.find_box_child(child)
+        box_child.is_center = True
+
+    def do_set_box(self, box):
+        self._box = box
+
+    def do_get_height_request(self, for_width):
+        size = self._calculate_size()
+        return (size, size)
+
+    def do_get_width_request(self):
+        size = self._calculate_size()        
+        return (size, size)
+
+    def do_allocate(self, x, y, width, height,
+                    req_width, req_height, origin_changed):
+        r = self._get_radius()
+        index = 0
+
+        for child in self._box.get_layout_children():
+            cx = x + width / 2
+            cy = x + height / 2
+
+            min_width, child_width = child.get_width_request()
+            min_height, child_height = child.get_height_request(child_width)
+
+            if child.is_center:
+                child.allocate(x + (width - child_width) / 2,
+                               y + (height - child_height) / 2,
+                               child_width, child_height, origin_changed)
+            else:
+                angle = 2 * math.pi * index / self._nflakes
+
+                dx = math.cos(angle) * r
+                dy = math.sin(angle) * r
+
+                child_x = int(x + (width - child_width) / 2 + dx)
+                child_y = int(y + (height - child_height) / 2 + dy)
+
+                child.allocate(child_x, child_y, child_width,
+                               child_height, origin_changed)
+
+                index += 1
+
+    def _get_radius(self):
+        return int(_BASE_RADIUS + _CHILDREN_FACTOR * self._nflakes)
+
+    def _calculate_size(self):
+        size = 0
+        for child in self._box.get_layout_children():
+            [min_width, child_width] = child.get_width_request()
+            [min_height, child_height] = child.get_height_request(child_width)
+
+            new_size = max(child_width, child_height)
+            if not child.is_center:
+                new_size += self._get_radius() * 2
+
+            if new_size > size:
+                size = new_size
+
+        return size