Image.set_height() should return True or False
If set_height() returns False, we know something went wrong and that we should try again using the default image.
This commit is contained in:
parent
3ed0b10aab
commit
5839190bb4
|
@ -15,18 +15,22 @@ class Image(gtk.Image):
|
||||||
def set_height(self, new_h):
|
def set_height(self, new_h):
|
||||||
buf = self.get_pixbuf()
|
buf = self.get_pixbuf()
|
||||||
if buf == None:
|
if buf == None:
|
||||||
return
|
return False
|
||||||
w = buf.get_width()
|
w = buf.get_width()
|
||||||
h = buf.get_height()
|
h = buf.get_height()
|
||||||
if h == new_h:
|
if h == new_h:
|
||||||
return
|
return False
|
||||||
if h == 0:
|
if h == 0:
|
||||||
h = 1
|
h = 1
|
||||||
new_w = (float(w) / float(h)) * new_h
|
new_w = (float(w) / float(h)) * new_h
|
||||||
if new_w > 0 and new_h > 0:
|
if new_w <= 0 or new_h <= 0:
|
||||||
buf = buf.scale_simple(int(new_w), int(new_h), gtk.gdk.INTERP_HYPER)
|
return False
|
||||||
self.set_from_pixbuf(buf)
|
|
||||||
|
|
||||||
|
buf = buf.scale_simple(int(new_w), int(new_h), gtk.gdk.INTERP_HYPER)
|
||||||
|
if buf == None:
|
||||||
|
return False
|
||||||
|
self.set_from_pixbuf(buf)
|
||||||
|
return True
|
||||||
|
|
||||||
class AlbumArt(Image):
|
class AlbumArt(Image):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -42,14 +46,16 @@ class AlbumArt(Image):
|
||||||
|
|
||||||
def set(self, file=None):
|
def set(self, file=None):
|
||||||
gdk.threads_enter()
|
gdk.threads_enter()
|
||||||
if file != None:
|
for i in xrange(2):
|
||||||
self.file = file
|
self.file = file
|
||||||
self.set_from_file(self.file)
|
self.set_from_file(self.file)
|
||||||
self.set_height(64)
|
if self.set_height(64) == True:
|
||||||
|
break
|
||||||
|
file = "images/ocarina.png"
|
||||||
gdk.threads_leave()
|
gdk.threads_leave()
|
||||||
|
|
||||||
def set_height(self, new_h):
|
def set_height(self, new_h):
|
||||||
size = self.size_request()
|
size = self.size_request()
|
||||||
if size[1] == new_h:
|
if size[1] == new_h:
|
||||||
return
|
return
|
||||||
Image.set_height(self, new_h)
|
return Image.set_height(self, new_h)
|
||||||
|
|
Loading…
Reference in New Issue