Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4424/src
Modified Files:
osd.py
Log Message:
Some bug fixes
Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** osd.py 12 Jun 2003 00:09:43 -0000 1.41
--- osd.py 12 Jun 2003 00:37:12 -0000 1.42
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.42 2003/06/12 00:37:12 gsbarbieri
+ # Some bug fixes
+ #
# Revision 1.41 2003/06/12 00:09:43 gsbarbieri
# Fixed some bugs
***************
*** 995,999 ****
char_size, char_height = self.stringsize(char, font, ptsize)
! if ((occupied_size + char_size) < width) and (char != '\n'):
occupied_size += char_size
--- 998,1002 ----
char_size, char_height = self.stringsize(char, font, ptsize)
! if ((occupied_size + char_size) <= width) and (char != '\n'):
occupied_size += char_size
***************
*** 1001,1005 ****
else:
! if (occupied_height + char_height) < height:
# we can add one more line
occupied_height += word_height
--- 1004,1008 ----
else:
! if (occupied_height + char_height) <= height:
# we can add one more line
occupied_height += word_height
***************
*** 1020,1024 ****
len_line = len(lines[line_number])
for j in range(len_line):
! if (occupied_size + ellipses_size) < width:
break
char_size = self.charsize(lines[line_number][len_line-j-1],
--- 1023,1027 ----
len_line = len(lines[line_number])
for j in range(len_line):
! if (occupied_size + ellipses_size) <= width:
break
char_size = self.charsize(lines[line_number][len_line-j-1],
***************
*** 1030,1034 ****
while ellipses and \
(occupied_size + self.stringsize(ellipses, font,
ptsize)[0]) \
! >= width:
ellipses = ellipses[:-1]
lines[line_number] += ellipses
--- 1033,1037 ----
while ellipses and \
(occupied_size + self.stringsize(ellipses, font,
ptsize)[0]) \
! > width:
ellipses = ellipses[:-1]
lines[line_number] += ellipses
-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
