diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-02-28 15:41:50 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-02-28 15:41:50 (GMT) |
| commit | 6704e1bfd30580ba3f8b9b36f336f41242e96785 (patch) | |
| tree | e003c54a8f973357962015b07adc7268e469fd82 /sugar | |
| parent | 32ac23ce27a9ce6f26f38b30da22cba6aa98ff19 (diff) | |
Button fixes and fix launching activities from the clipboard.
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/graphics/iconbutton.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sugar/graphics/iconbutton.py b/sugar/graphics/iconbutton.py index a58300b..fea02fb 100644 --- a/sugar/graphics/iconbutton.py +++ b/sugar/graphics/iconbutton.py @@ -43,16 +43,17 @@ class IconButton(CanvasIcon): CanvasIcon.__init__(self, cache=True, **kwargs) - if not self.props.fill_color: + if self._active: self.props.fill_color = color.BUTTON_BACKGROUND_NORMAL - if not self.props.stroke_color: self.props.stroke_color = color.BUTTON_NORMAL - self.props.background_color = color.BUTTON_BACKGROUND_NORMAL.get_int() + self.props.background_color = \ + color.BUTTON_BACKGROUND_NORMAL.get_int() + else: + self.props.fill_color = color.BUTTON_BACKGROUND_INACTIVE + self.props.stroke_color = color.BUTTON_INACTIVE + self.props.background_color = \ + color.BUTTON_BACKGROUND_INACTIVE.get_int() - self._normal_fill_color = self.props.fill_color - self._normal_stroke_color = self.props.stroke_color - self._normal_background_color = self.props.background_color - self._set_size(STANDARD_SIZE) self.connect('button-press-event', @@ -76,13 +77,11 @@ class IconButton(CanvasIcon): elif pspec.name == 'active': self._active = value if self._active: - self.props.fill_color = self._normal_fill_color - self.props.stroke_color = self._normal_stroke_color - self.props.background_color = self._normal_background_color + self.props.fill_color = color.BUTTON_BACKGROUND_NORMAL + self.props.stroke_color = color.BUTTON_NORMAL else: self.props.fill_color = color.BUTTON_BACKGROUND_INACTIVE self.props.stroke_color = color.BUTTON_INACTIVE - self.props.background_color = color.BUTTON_BACKGROUND_INACTIVE.get_int() else: CanvasIcon.do_set_property(self, pspec, value) @@ -104,5 +103,5 @@ class IconButton(CanvasIcon): if self._active: self.props.background_color = color.BLACK.get_int() else: - if self._active: - self.props.background_color = self._normal_background_color + self.props.background_color = \ + color.BUTTON_BACKGROUND_NORMAL.get_int() |