From 759c477e1f436661fd29679b2754456eee1f7a38 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 26 Jan 2007 11:28:45 -0500 Subject: [PATCH] Revert "Set width/height the right way" This reverts commit 0eaa29ee9d3aac7514bdbe3e6ae087a3b51f336c. --- sugar/graphics/canvasicon.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sugar/graphics/canvasicon.py b/sugar/graphics/canvasicon.py index 714ba307..7da71f7a 100644 --- a/sugar/graphics/canvasicon.py +++ b/sugar/graphics/canvasicon.py @@ -145,8 +145,6 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem): self._buffers = {} self._cur_buffer = None self._size = 24 - self.props.box_width = self._size - self.props.box_height = self._size self._color = None self._icon_name = None self._cache = False @@ -177,8 +175,6 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem): if self._size != value and not self._cache: self._clear_buffers() self._size = value - self.props.box_width = value - self.props.box_height = value self.emit_request_changed() elif pspec.name == 'cache': self._cache = value @@ -233,5 +229,11 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem): cr.set_source_surface(buf, x, y) cr.paint() + def do_get_width_request(self): + return self._size + + def do_get_height_request(self, for_width): + return self._size + def _button_press_event_cb(self, item, event): item.emit_activated()