diff options
| author | Dan Winship <dwinship@redhat.com> | 2007-08-08 22:19:05 (GMT) |
|---|---|---|
| committer | Dan Winship <dwinship@redhat.com> | 2007-08-08 22:19:05 (GMT) |
| commit | 985fe6ef358ce28d7d04f199d9a342f4a4fe0a79 (patch) | |
| tree | e50cf7b89225cf8d7420ee366c123b673410fd06 /sugar | |
| parent | a1302ccbb287b95be0e5f1e0b50c08fca0dc597d (diff) | |
Make activity icons in frame outline-only. #2668
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/graphics/canvasicon.py | 8 | ||||
| -rw-r--r-- | sugar/graphics/iconbutton.py | 2 | ||||
| -rw-r--r-- | sugar/graphics/style.py | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/sugar/graphics/canvasicon.py b/sugar/graphics/canvasicon.py index e879f05..39f1358 100644 --- a/sugar/graphics/canvasicon.py +++ b/sugar/graphics/canvasicon.py @@ -231,13 +231,13 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem): stroke_color = None if self._active: if self._fill_color: - fill_color = self._fill_color.get_html() + fill_color = self._fill_color.get_svg() if self._stroke_color: - stroke_color = self._stroke_color.get_html() + stroke_color = self._stroke_color.get_svg() else: - stroke_color = color.ICON_STROKE_INACTIVE.get_html() + stroke_color = color.ICON_STROKE_INACTIVE.get_svg() if self._fill_color: - fill_color = self._fill_color.get_html() + fill_color = self._fill_color.get_svg() return [fill_color, stroke_color] def _get_handle(self, name, handle): diff --git a/sugar/graphics/iconbutton.py b/sugar/graphics/iconbutton.py index 85ea4e4..ba9fad8 100644 --- a/sugar/graphics/iconbutton.py +++ b/sugar/graphics/iconbutton.py @@ -53,7 +53,7 @@ class IconButton(CanvasIcon, hippo.CanvasItem): if self.props.active: self.props.background_color = 0x000000FF else: - self.props.background_color = 0x404040FF + self.props.background_color = 0x00000000 def _icon_clicked_cb(self, button): if self._palette: diff --git a/sugar/graphics/style.py b/sugar/graphics/style.py index 55b4a4b..a5186da 100644 --- a/sugar/graphics/style.py +++ b/sugar/graphics/style.py @@ -81,6 +81,12 @@ class Color(object): return (r, g, b) + def get_svg(self): + if self._a == 0.0: + return 'none' + else: + return self.get_html() + _XO_DPI = 200.0 _FOCUS_LINE_WIDTH = 2 @@ -113,6 +119,7 @@ TOOLBOX_TAB_LABEL_WIDTH = zoom(150 - 15 * 2) COLOR_BLACK = Color('#000000') COLOR_WHITE = Color('#FFFFFF') +COLOR_TRANSPARENT = Color('#FFFFFF', alpha=0.0) COLOR_PANEL_GREY = Color('#C0C0C0') COLOR_SELECTION_GREY = Color('#A6A6A6') COLOR_INACTIVE_FILL = Color('#9D9FA1') |