From d59cd5af83dad1d6ff852f4601144c951df1920f Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 11 Jul 2007 12:35:13 +0200 Subject: [PATCH] Fix intro colors --- shell/intro/intro.py | 3 ++- sugar/graphics/style.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/shell/intro/intro.py b/shell/intro/intro.py index 782a6514..a307b91b 100644 --- a/shell/intro/intro.py +++ b/shell/intro/intro.py @@ -111,7 +111,8 @@ class _IntroBox(hippo.CanvasBox): PAGE_LAST = PAGE_COLOR def __init__(self): - hippo.CanvasBox.__init__(self, padding=style.zoom(30)) + hippo.CanvasBox.__init__(self, padding=style.zoom(30), + background_color=_BACKGROUND_COLOR.get_int()) self._page = self.PAGE_NAME self._name_page = _NamePage() diff --git a/sugar/graphics/style.py b/sugar/graphics/style.py index 1c829060..7363b7eb 100644 --- a/sugar/graphics/style.py +++ b/sugar/graphics/style.py @@ -48,7 +48,7 @@ class Font(object): return pango.FontDescription(self._desc) class Color(object): - def __init__(self, color, alpha=0): + def __init__(self, color, alpha=1.0): self._r, self._g, self._b = self._html_to_rgb(color) self._a = alpha @@ -88,7 +88,7 @@ _TAB_CURVATURE = 1 ZOOM_FACTOR = _compute_zoom_factor() -DEFAULT_SPACING = zoom(6) +DEFAULT_SPACING = zoom(8) FONT_SIZE = zoom(7 * _XO_DPI / _get_screen_dpi()) FONT_NORMAL = Font('Bitstream Vera Sans %d' % FONT_SIZE) @@ -102,4 +102,5 @@ TOOLBOX_TAB_VBORDER = int((zoom(36) - FONT_NORMAL_H - _FOCUS_LINE_WIDTH) / 2) TOOLBOX_TAB_HBORDER = zoom(15) - _FOCUS_LINE_WIDTH - _TAB_CURVATURE TOOLBOX_TAB_LABEL_WIDTH = zoom(150 - 15 * 2) +COLOR_WHITE = Color('#FFFFFF') COLOR_PANEL_GREY = Color('#C0C0C0')