Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
This commit is contained in:
commit
9e5d3c1117
@ -373,6 +373,10 @@ class Icon(gtk.Image):
|
||||
|
||||
def do_set_property(self, pspec, value):
|
||||
if pspec.name == 'xo-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':
|
||||
@ -433,6 +437,10 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
|
||||
self._buffer.icon_name = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
elif pspec.name == 'xo-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':
|
||||
|
Loading…
Reference in New Issue
Block a user