diff options
| -rw-r--r-- | sugar/graphics/snowflakebox.py | 9 | ||||
| -rwxr-xr-x | tests/test-snowflake-box.py | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/sugar/graphics/snowflakebox.py b/sugar/graphics/snowflakebox.py index c9b73de..8ad2664 100644 --- a/sugar/graphics/snowflakebox.py +++ b/sugar/graphics/snowflakebox.py @@ -21,7 +21,7 @@ class SnowflakeBox(hippo.CanvasBox, hippo.CanvasItem): return [width / 2, height / 2] def _get_radius(self): - return _BASE_RADIUS + _CHILDREN_FACTOR * len(self.get_children()) + return _BASE_RADIUS + _CHILDREN_FACTOR * self._get_n_children() def _layout_root(self): [width, height] = self._root.get_allocation() @@ -32,12 +32,15 @@ class SnowflakeBox(hippo.CanvasBox, hippo.CanvasItem): self.move(self._root, int(x), int(y)) + def _get_n_children(self): + return len(self.get_children()) - 1 + def _layout_child(self, child, index): r = self._get_radius() - if (len(self.get_children()) > 10): + if (self._get_n_children() > 10): r += _FLAKE_DISTANCE * (index % 3) - angle = 2 * math.pi / len(self.get_children()) * index + angle = 2 * math.pi * index / self._get_n_children() [width, height] = child.get_allocation() [cx, cy] = self._get_center() diff --git a/tests/test-snowflake-box.py b/tests/test-snowflake-box.py index cdafce6..8c0c2fa 100755 --- a/tests/test-snowflake-box.py +++ b/tests/test-snowflake-box.py @@ -40,9 +40,15 @@ canvas = hippo.Canvas() root_box = hippo.CanvasBox(background_color=0xe2e2e2ff) canvas.set_root(root_box) -box = SnowflakeBox() -snow_flake = _create_snowflake(box, 30) -root_box.append(box) +box1 = SnowflakeBox() +snow_flake = _create_snowflake(box1, 30) +root_box.append(box1, hippo.PACK_FIXED) +root_box.move(box1, 0, 0) + +box2 = SnowflakeBox() +snow_flake = _create_snowflake(box2, 10) +root_box.append(box2, hippo.PACK_FIXED) +root_box.move(box2, 400, 0) canvas.show() window.add(canvas) |