Update of /cvsroot/freevo/freevo/skins/dischi1
In directory sc8-pr-cvs1:/tmp/cvs-serv20912
Modified Files:
area.py
Log Message:
fixed a redraw bug
Index: area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/area.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** area.py 22 Mar 2003 20:08:30 -0000 1.30
--- area.py 22 Mar 2003 22:19:01 -0000 1.31
***************
*** 28,31 ****
--- 28,34 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2003/03/22 22:19:01 dischi
+ # fixed a redraw bug
+ #
# Revision 1.30 2003/03/22 20:08:30 dischi
# Lots of changes:
***************
*** 408,411 ****
--- 411,416 ----
if not self.update_content_needed():
self.content_objects = self.last_content_objects
+ for o in self.content_objects:
+ self.screen.draw(o[5][0], o[5][1])
return
***************
*** 468,472 ****
elif c_rect[0] < c_rect[2]:
self.screen.update('content', c_rect)
!
self.last_bg_objects = self.bg_objects
self.last_content_objects = self.content_objects
--- 473,477 ----
elif c_rect[0] < c_rect[2]:
self.screen.update('content', c_rect)
!
self.last_bg_objects = self.bg_objects
self.last_content_objects = self.content_objects
***************
*** 682,692 ****
in a variable. The real drawing is done inside draw()
"""
if self.mode == 1:
! self.content_objects += [ ( 'rectangle', x, y, width,
! height, rect.bgcolor, rect.size, rect.color,
! rect.radius ) ]
! self.screen.draw('background', ('rectangle', x, y, x+width, y+height,
rect.bgcolor,
! rect.size, rect.color, rect.radius))
--- 687,697 ----
in a variable. The real drawing is done inside draw()
"""
+
+ draw = ('background', ('rectangle', x, y, x+width, y+height, rect.bgcolor,
+ rect.size, rect.color, rect.radius))
if self.mode == 1:
! self.content_objects += [ ( 'rectangle', x, y, width, height, draw ) ]
! self.screen.draw(draw[0], draw[1])
***************
*** 722,727 ****
height2 = font.h + 2
! self.screen.draw('content', ('text', text, font, x, y, width, height,
height2,
! align_h, align_v, mode, ellipses ))
if return_area:
--- 727,732 ----
height2 = font.h + 2
! draw = ('content', ('text', text, font, x, y, width, height, height2,
! align_h, align_v, mode, ellipses ))
if return_area:
***************
*** 730,735 ****
align_h = align_h, align_v = align_v,
mode=mode, ellipses=ellipses,
layer=self.dummy_layer)
! self.content_objects += [ ( 'text', x, y, width, height2, height, text,
font, align_h,
! align_v, mode, ellipses ) ]
if return_area:
--- 735,741 ----
align_h = align_h, align_v = align_v,
mode=mode, ellipses=ellipses,
layer=self.dummy_layer)
!
! self.screen.draw(draw[0], draw[1])
! self.content_objects += [ ( 'text', x, y, width, height2, draw) ]
if return_area:
***************
*** 743,762 ****
"""
if isinstance(image, str):
! image = pygame.transform.scale(osd.loadbitmap(image), (val.width,
val.height))
!
if isinstance(val, tuple):
! self.screen.draw('content', ('image', image, val[0], val[1],
image.get_width(),
! image.get_height()))
self.content_objects += [ ( 'image', val[0], val[1], image.get_width(),
! image.get_height(), image ) ]
return
elif hasattr(val, 'label') and val.label == 'background':
! self.screen.draw('background', ('image', image, val.x, val.y, val.width,
! val.height))
else:
! self.screen.draw('content', ('image', image, val.x, val.y, val.width,
val.height))
self.content_objects += [ ( 'image', val.x, val.y, val.width,
! val.height, image ) ]
--- 749,777 ----
"""
if isinstance(image, str):
! cname = '%s-%s-%s' % (image, val.width, val.height)
! cimage = self.imagecache[cname]
! if not cimage:
! image = pygame.transform.scale(osd.loadbitmap(image), (val.width,
val.height))
! self.imagecache[cname] = image
! else:
! image = cimage
!
if isinstance(val, tuple):
! draw = ( 'content', ('image', image, val[0], val[1], image.get_width(),
! image.get_height()) )
!
! self.screen.draw(draw[0], draw[1])
self.content_objects += [ ( 'image', val[0], val[1], image.get_width(),
! image.get_height(), draw ) ]
return
elif hasattr(val, 'label') and val.label == 'background':
! draw = ( 'background', ('image', image, val.x, val.y, val.width,
! val.height) )
else:
! draw = ( 'content', ('image', image, val.x, val.y, val.width,
val.height))
+ self.screen.draw(draw[0], draw[1])
self.content_objects += [ ( 'image', val.x, val.y, val.width,
! val.height, draw ) ]
-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open!
Get cracking and register here for some mind boggling fun and
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
