sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show selecting status of favorite check box in journal list view even if "start" is prelighted #1247

Browse Source
This commit is contained in:
Aleksey Lim 2009-08-29 21:50:18 +00:00
parent 6b992ee9fb
commit aed38758be
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/sugar/graphics/icon.py
View File

@ -959,6 +959,7 @@ class CellRendererIcon(gtk.GenericCellRenderer):
self._buffer = _IconBuffer() self._buffer = _IconBuffer()
self._buffer.cache = True self._buffer.cache = True
self._xo_color = None
self._fill_color = None self._fill_color = None
self._stroke_color = None self._stroke_color = None
self._prelit_fill_color = None self._prelit_fill_color = None
@ -994,15 +995,14 @@ class CellRendererIcon(gtk.GenericCellRenderer):
icon_name = gobject.property(type=str, setter=set_icon_name) icon_name = gobject.property(type=str, setter=set_icon_name)
def set_xo_color(self, value): def get_xo_color(self):
if value is not None: return self._xo_color
self._stroke_color = value.get_stroke_color()
self._fill_color = value.get_fill_color()
else:
self._stroke_color = None
self._fill_color = None
xo_color = gobject.property(type=object, setter=set_xo_color) def set_xo_color(self, value):
self._xo_color = value
xo_color = gobject.property(type=object,
getter=get_xo_color, setter=set_xo_color)
def set_fill_color(self, value): def set_fill_color(self, value):
if self._fill_color != value: if self._fill_color != value:
@ -1089,17 +1089,29 @@ class CellRendererIcon(gtk.GenericCellRenderer):
return False return False
def on_render(self, window, widget, background_area, cell_area, def on_render(self, window, widget, background_area, cell_area,
expose_area, flags): expose_area, flags):
has_prelit_colors = None not in [self._prelit_fill_color, if self._xo_color is not None:
self._prelit_stroke_color] stroke_color = self._xo_color.get_stroke_color()
fill_color = self._xo_color.get_fill_color()
prelit_fill_color = stroke_color
prelit_stroke_color = fill_color
else:
stroke_color = self._stroke_color
fill_color = self._fill_color
prelit_fill_color = self._prelit_fill_color
prelit_stroke_color = self._prelit_stroke_color
has_prelit_colors = None not in [prelit_fill_color,
prelit_stroke_color]
if flags & gtk.CELL_RENDERER_PRELIT and has_prelit_colors and \ if flags & gtk.CELL_RENDERER_PRELIT and has_prelit_colors and \
self._is_prelit(widget): self._is_prelit(widget):
self._buffer.fill_color = self._prelit_fill_color self._buffer.fill_color = prelit_fill_color
self._buffer.stroke_color = self._prelit_stroke_color self._buffer.stroke_color = prelit_stroke_color
else: else:
self._buffer.fill_color = self._fill_color self._buffer.fill_color = fill_color
self._buffer.stroke_color = self._stroke_color self._buffer.stroke_color = stroke_color
surface = self._buffer.get_surface() surface = self._buffer.get_surface()
if surface is None: if surface is None: