Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

This commit is contained in:
Marco Pesenti Gritti 2007-02-27 17:05:01 +01:00
commit b2f50f9da4

View File

@ -43,8 +43,10 @@ class Button(hippo.CanvasBox, hippo.CanvasItem):
self._icon = None self._icon = None
self._round_box = RoundBox() self._round_box = RoundBox()
self._round_box.props.border_color = 0 self._round_box.props.border_color = color.BLACK.get_int()
self._round_box.props.background_color = color.BLACK.get_int() 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._text_box = hippo.CanvasText() self._text_box = hippo.CanvasText()
self._text_box.props.font_desc = font.DEFAULT.get_pango_desc() self._text_box.props.font_desc = font.DEFAULT.get_pango_desc()