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

Get icon size from the handle. Remove the padding from

Browse Source 
the zoom view icons and reorder them.
This commit is contained in:
Marco Pesenti Gritti 2006-09-22 10:55:10 +02:00
parent 4d0dae0e35
commit 5e55efe9d5
2 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shell/view/frame/TopPanel.py
View File

@ -61,28 +61,28 @@ class TopPanel(goocanvas.Group):
grid = shell.get_grid() grid = shell.get_grid()
box = CanvasBox(grid, CanvasBox.HORIZONTAL, 1) box = CanvasBox(grid, CanvasBox.HORIZONTAL)
grid.set_constraints(box, 5, 0) grid.set_constraints(box, 5, 0)
self.add_child(box) self.add_child(box)
icon = IconItem(icon_name='stock-zoom-activity') icon = IconItem(icon_name='stock-zoom-mesh')
icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_ACTIVITY) icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_MESH)
box.set_constraints(icon, 3, 3) box.set_constraints(icon, 5, 5)
box.add_child(icon)
icon = IconItem(icon_name='stock-zoom-home')
icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_HOME)
box.set_constraints(icon, 3, 3)
box.add_child(icon) box.add_child(icon)
icon = IconItem(icon_name='stock-zoom-friends') icon = IconItem(icon_name='stock-zoom-friends')
icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_FRIENDS) icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_FRIENDS)
box.set_constraints(icon, 3, 3) box.set_constraints(icon, 5, 5)
box.add_child(icon) box.add_child(icon)
icon = IconItem(icon_name='stock-zoom-mesh') icon = IconItem(icon_name='stock-zoom-home')
icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_MESH) icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_HOME)
box.set_constraints(icon, 3, 3) box.set_constraints(icon, 5, 5)
box.add_child(icon)
icon = IconItem(icon_name='stock-zoom-activity')
icon.connect('clicked', self._level_clicked_cb, sugar.ZOOM_ACTIVITY)
box.set_constraints(icon, 5, 5)
box.add_child(icon) box.add_child(icon)
self._box = box self._box = box

42
sugar/canvas/IconItem.py
View File

@ -9,19 +9,16 @@ import cairo
from sugar.util import GObjectSingletonMeta from sugar.util import GObjectSingletonMeta
from sugar.canvas.IconColor import IconColor from sugar.canvas.IconColor import IconColor
_ICON_SIZE = 48
class _IconCache: class _IconCache:
def __init__(self): def __init__(self):
self._icons = {} self._icons = {}
self._theme = gtk.icon_theme_get_default()
def _read_icon(self, name, color): def _read_icon(self, filename, color):
theme = gtk.icon_theme_get_default() icon_file = open(filename, 'r')
info = theme.lookup_icon(name, _ICON_SIZE, 0)
icon_file = open(info.get_filename(), 'r')
if color == None: if color == None:
return rsvg.Handle(file=info.get_filename()) return rsvg.Handle(file=filename)
else: else:
data = icon_file.read() data = icon_file.read()
icon_file.close() icon_file.close()
@ -40,16 +37,18 @@ class _IconCache:
return rsvg.Handle(data=data) return rsvg.Handle(data=data)
def get_handle(self, name, color): def get_handle(self, name, color, size):
info = self._theme.lookup_icon(name, size, 0)
if color: if color:
key = (name, color.to_string()) key = (info.get_filename(), color.to_string())
else: else:
key = name key = info.get_filename()
if self._icons.has_key(key): if self._icons.has_key(key):
icon = self._icons[key] icon = self._icons[key]
else: else:
icon = self._read_icon(name, color) icon = self._read_icon(info.get_filename(), color)
self._icons[key] = icon self._icons[key] = icon
return icon return icon
@ -66,7 +65,7 @@ class IconView(goocanvas.ItemViewSimple, goocanvas.ItemView):
self.item = item self.item = item
self._buffer = None self._buffer = None
self._buffer_scale = 0.0 self._buffer_size = 0.0
item.connect('changed', goocanvas.item_view_simple_item_changed, self) item.connect('changed', goocanvas.item_view_simple_item_changed, self)
@ -118,16 +117,18 @@ class IconView(goocanvas.ItemViewSimple, goocanvas.ItemView):
return self.bounds return self.bounds
def _get_buffer(self, cr, handle, scale): def _get_buffer(self, cr, handle, size):
if self._buffer and self._buffer_scale != scale: if self._buffer and self._buffer_size != size:
del self._buffer del self._buffer
self._buffer = None self._buffer = None
if self._buffer == None: if self._buffer == None:
size = int(_ICON_SIZE * scale)
surface = cr.get_target().create_similar( surface = cr.get_target().create_similar(
cairo.CONTENT_COLOR_ALPHA, size, size) cairo.CONTENT_COLOR_ALPHA, size, size)
dimensions = handle.get_dimension_data()
scale = size / dimensions[0]
ctx = cairo.Context(surface) ctx = cairo.Context(surface)
ctx.scale(scale, scale) ctx.scale(scale, scale)
handle.render_cairo(ctx) handle.render_cairo(ctx)
@ -139,16 +140,13 @@ class IconView(goocanvas.ItemViewSimple, goocanvas.ItemView):
return self._buffer return self._buffer
def do_paint(self, cr, bounds, scale): def do_paint(self, cr, bounds, scale):
scale_factor = float(self.item.size) / float(_ICON_SIZE)
if scale_factor == 0.0:
return
icon_name = self.item.icon_name icon_name = self.item.icon_name
if icon_name == None: if icon_name == None:
icon_name = 'stock-missing' icon_name = 'stock-missing'
handle = IconView._cache.get_handle(icon_name, self.item.color) handle = IconView._cache.get_handle(
buf = self._get_buffer(cr, handle, scale_factor) icon_name, self.item.color, self.item.size)
buf = self._get_buffer(cr, handle, self.item.size)
cr.save() cr.save()
@ -184,7 +182,7 @@ class IconItem(goocanvas.ItemSimple, goocanvas.Item):
gobject.PARAM_READWRITE), gobject.PARAM_READWRITE),
'color' : (object, None, None, 'color' : (object, None, None,
gobject.PARAM_READWRITE), gobject.PARAM_READWRITE),
'size' : (int, None, None, 'size' : (float, None, None,
0, 1024, 24, 0, 1024, 24,
gobject.PARAM_READWRITE) gobject.PARAM_READWRITE)
} }