diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-02-27 22:19:16 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-02-27 22:19:16 (GMT) |
| commit | e3bab8cd125466021e83221e2424e193f1a74c9a (patch) | |
| tree | 9d7cc1e2b2da40840ec3c6d202a84bec2f51ab48 /sugar | |
| parent | 5f288b68c9e34960d82958faf4a1b7482cdfe769 (diff) | |
| parent | a6a8ad5677f01b082821afafab68431474386fff (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/graphics/button.py | 7 | ||||
| -rw-r--r-- | sugar/graphics/iconbutton.py | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sugar/graphics/button.py b/sugar/graphics/button.py index 4419327..7b487ae 100644 --- a/sugar/graphics/button.py +++ b/sugar/graphics/button.py @@ -47,7 +47,8 @@ class Button(hippo.CanvasBox, hippo.CanvasItem): self._round_box.props.background_color = color.BLACK.get_int() self._round_box.props.padding_top = units.points_to_pixels(1) self._round_box.props.padding_bottom = units.points_to_pixels(1) - + self._round_box.props.spacing = units.points_to_pixels(3) + self._text_box = hippo.CanvasText() self._text_box.props.font_desc = font.DEFAULT.get_pango_desc() self._text_box.props.color = color.BUTTON_NORMAL.get_int() @@ -87,8 +88,8 @@ class Button(hippo.CanvasBox, hippo.CanvasItem): else: self._icon = CanvasIcon(icon_name=value, scale=units.SMALL_ICON_SCALE, - fill_color=color.WHITE, - stroke_color=color.BLACK) + fill_color=color.BLACK, + stroke_color=color.WHITE) # Insert icon on the label's left self._round_box.remove_all() self._round_box.append(self._icon) diff --git a/sugar/graphics/iconbutton.py b/sugar/graphics/iconbutton.py index cc70341..a58300b 100644 --- a/sugar/graphics/iconbutton.py +++ b/sugar/graphics/iconbutton.py @@ -102,9 +102,7 @@ class IconButton(CanvasIcon): def prelight(self, enter): if enter: if self._active: - self.props.fill_color = color.BLACK self.props.background_color = color.BLACK.get_int() else: if self._active: - self.props.fill_color = self._normal_fill_color self.props.background_color = self._normal_background_color |