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

CellRendererIcon: cache offsets

Browse Source 
Instead of calculating them on each render.  The cache is removed when
the size is changed.

Signed-off-by: Manuel Quiñones <manuel.por.aca@gmail.com>
This commit is contained in:
Gonzalo Odiard 2014-05-07 09:07:36 -03:00
parent f08757d75f
commit d9e6fa6813
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sugar3/graphics/icon.py
View File

@ -837,6 +837,7 @@ class CellRendererIcon(Gtk.CellRenderer):
self._prelit_stroke_color = None self._prelit_stroke_color = None
self._active_state = False self._active_state = False
self._palette_invoker = CellRendererInvoker() self._palette_invoker = CellRendererInvoker()
self._cached_offsets = None
Gtk.CellRenderer.__init__(self) Gtk.CellRenderer.__init__(self)
@ -924,6 +925,8 @@ class CellRendererIcon(Gtk.CellRenderer):
self._buffer.width = value self._buffer.width = value
self._buffer.height = value self._buffer.height = value
self._cached_offsets = None
size = GObject.property(type=object, setter=set_size) size = GObject.property(type=object, setter=set_size)
def do_get_size(self, widget, cell_area, x_offset=None, y_offset=None, def do_get_size(self, widget, cell_area, x_offset=None, y_offset=None,
@ -942,9 +945,17 @@ class CellRendererIcon(Gtk.CellRenderer):
xoffset = max(xoffset * (cell_area.width - width), 0) xoffset = max(xoffset * (cell_area.width - width), 0)
yoffset = max(self.props.yalign * (cell_area.height - height), 0) yoffset = max(self.props.yalign * (cell_area.height - height), 0)
self._cached_offsets = xoffset, yoffset
return xoffset, yoffset, width, height return xoffset, yoffset, width, height
def _get_offsets(self, widget, cell_area):
if self._cached_offsets is not None:
return self._cached_offsets
xoffset, yoffset, width_, height_ = self.do_get_size(widget, cell_area)
return xoffset, yoffset
def do_activate(self, event, widget, path, background_area, cell_area, def do_activate(self, event, widget, path, background_area, cell_area,
flags): flags):
pass pass
@ -1033,7 +1044,7 @@ class CellRendererIcon(Gtk.CellRenderer):
if surface is None: if surface is None:
return return
xoffset, yoffset, width_, height_ = self.do_get_size(widget, cell_area) xoffset, yoffset = self._get_offsets(widget, cell_area)
x = cell_area.x + xoffset x = cell_area.x + xoffset
y = cell_area.y + yoffset y = cell_area.y + yoffset