Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1:/tmp/cvs-serv26738/src/skins/main
Modified Files:
info_area.py screen.py
Log Message:
move skin font handling to osd to avoid duplicate code
Index: info_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/info_area.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** info_area.py 11 Jan 2004 10:57:58 -0000 1.11
--- info_area.py 11 Jan 2004 20:23:31 -0000 1.12
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2004/01/11 20:23:31 dischi
+ # move skin font handling to osd to avoid duplicate code
+ #
# Revision 1.11 2004/01/11 10:57:58 dischi
# support for function calls (e.g. comingup)
***************
*** 394,407 ****
height = -1
- if element.font.shadow.visible:
- shadow = (element.font.shadow.x, element.font.shadow.y,
- element.font.shadow.color)
- else:
- shadow = None
size = osd.drawstringframed( _(element.text), 0, 0,
r.width, r.height,
! element.font.font, None, None,
element.align, element.valign,
! element.mode, shadow=shadow, layer=''
)[ 1 ]
m_width = size[ 2 ] - size[ 0 ]
m_height = size[ 3 ] - size[ 1 ]
--- 397,405 ----
height = -1
size = osd.drawstringframed( _(element.text), 0, 0,
r.width, r.height,
! element.font, None, None,
element.align, element.valign,
! element.mode, layer='' )[ 1 ]
m_width = size[ 2 ] - size[ 0 ]
m_height = size[ 3 ] - size[ 1 ]
Index: screen.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/screen.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** screen.py 1 Jan 2004 17:41:05 -0000 1.7
--- screen.py 11 Jan 2004 20:23:31 -0000 1.8
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.8 2004/01/11 20:23:31 dischi
+ # move skin font handling to osd to avoid duplicate code
+ #
# Revision 1.7 2004/01/01 17:41:05 dischi
# add border support for Font
***************
*** 209,223 ****
ellipses in self.drawlist.text:
if self.in_update(x1, y1, x2, y2, update_area):
! shadow = None
! border = None
! if font.shadow.visible:
! if font.shadow.border:
! border = font.shadow.color
! else:
! shadow = (font.shadow.x, font.shadow.y,
font.shadow.color)
! osd.drawstringframed(text, x1, y1, x2 - x1, height, font.font,
! font.color, font.bgcolor, align_h = align_h,
align_v = align_v, mode=mode,
- shadow=shadow, border_color=border,
ellipses=ellipses, layer=layer)
--- 212,218 ----
ellipses in self.drawlist.text:
if self.in_update(x1, y1, x2, y2, update_area):
! osd.drawstringframed(text, x1, y1, x2 - x1, height, font,
! align_h = align_h,
align_v = align_v, mode=mode,
ellipses=ellipses, layer=layer)
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
