cleaner code

This commit is contained in:
Yann Leboulanger 2006-03-08 15:56:49 +00:00
parent e8f33c7c9c
commit 549872473c
1 changed files with 9 additions and 5 deletions

View File

@ -410,18 +410,22 @@ def get_scaled_pixbuf(pixbuf, kind):
# resize to a width / height for the avatar not to have distortion # resize to a width / height for the avatar not to have distortion
# (keep aspect ratio) # (keep aspect ratio)
width = gajim.config.get(kind + '_avatar_width')
height = gajim.config.get(kind + '_avatar_height')
# Pixbuf size
pix_width = pixbuf.get_width()
pix_height = pixbuf.get_height()
# don't make avatars bigger than they are # don't make avatars bigger than they are
if pixbuf.get_width() < gajim.config.get(kind + '_avatar_width') and \ if pix_width < width and pix_height < height:
pixbuf.get_height() < gajim.config.get(kind + '_avatar_height'):
return pixbuf # we don't want to make avatar bigger return pixbuf # we don't want to make avatar bigger
ratio = float(pixbuf.get_width()) / float(pixbuf.get_height()) ratio = float(pix_width) / float(pix_height)
if ratio > 1: if ratio > 1:
w = gajim.config.get(kind + '_avatar_width') w = width
h = int(w / ratio) h = int(w / ratio)
else: else:
h = gajim.config.get(kind + '_avatar_height') h = height
w = int(h * ratio) w = int(h * ratio)
scaled_buf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_HYPER) scaled_buf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_HYPER)
return scaled_buf return scaled_buf