From 01f774edbc17eb9435768bbfaa69c426fa6b7454 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Fri, 31 Aug 2007 11:26:28 +0200 Subject: [PATCH] Allow setting xo-color to None. --- sugar/graphics/icon.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sugar/graphics/icon.py b/sugar/graphics/icon.py index 133e256c..c710f1a2 100644 --- a/sugar/graphics/icon.py +++ b/sugar/graphics/icon.py @@ -373,8 +373,12 @@ class Icon(gtk.Image): def do_set_property(self, pspec, value): if pspec.name == 'xo-color': - self.props.fill_color = value.get_fill_color() - self.props.stroke_color = value.get_stroke_color() + if value is None: + self.props.fill_color = None + self.props.stroke_color = None + else: + self.props.fill_color = value.get_fill_color() + self.props.stroke_color = value.get_stroke_color() elif pspec.name == 'fill-color': self._buffer.fill_color = value elif pspec.name == 'stroke-color': @@ -433,8 +437,12 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem): self._buffer.icon_name = value self.emit_paint_needed(0, 0, -1, -1) elif pspec.name == 'xo-color': - self.props.fill_color = value.get_fill_color() - self.props.stroke_color = value.get_stroke_color() + if value is None: + self.props.fill_color = None + self.props.stroke_color = None + else: + self.props.fill_color = value.get_fill_color() + self.props.stroke_color = value.get_stroke_color() elif pspec.name == 'fill-color': if not isinstance(value, basestring) and value is not None: raise TypeError('fill-color must be a string, not %r' % type(value))