Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26724/src
Modified Files:
osd.py
Log Message:
Fixed some bugs
Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** osd.py 27 May 2003 17:53:33 -0000 1.40
--- osd.py 12 Jun 2003 00:09:43 -0000 1.41
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.41 2003/06/12 00:09:43 gsbarbieri
+ # Fixed some bugs
+ #
# Revision 1.40 2003/05/27 17:53:33 dischi
# Added new event handler module
***************
*** 642,645 ****
--- 645,649 ----
return_x1 = 0
return_y1 = 0
+ plain_tab = ' '
if DEBUG >= 3:
***************
*** 705,709 ****
else:
if words[word_number] == '\t':
! words[word_number] = ' '
word_size, word_height = self.stringsize(words[word_number],
font,ptsize)
# This word fit in this line?
--- 709,713 ----
else:
if words[word_number] == '\t':
! words[word_number] = plain_tab
word_size, word_height = self.stringsize(words[word_number],
font,ptsize)
# This word fit in this line?
***************
*** 989,995 ****
char = string[i]
! char_size, char_height = self.charsize(char, font, ptsize)
! if ((occupied_size + char_size) <= width) and (char != '\n'):
occupied_size += char_size
--- 993,999 ----
char = string[i]
! char_size, char_height = self.stringsize(char, font, ptsize)
! if ((occupied_size + char_size) < width) and (char != '\n'):
occupied_size += char_size
***************
*** 997,1001 ****
else:
! if (occupied_height + char_height) <= height:
# we can add one more line
occupied_height += word_height
--- 1001,1005 ----
else:
! if (occupied_height + char_height) < height:
# we can add one more line
occupied_height += word_height
***************
*** 1016,1020 ****
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],
--- 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],
***************
*** 1022,1030 ****
occupied_size -= char_size
lines[line_number] = lines[line_number][0:len_line-j]
if ellipses:
! while ellipses and ellipses_size >= width:
! ellipses = ellipses[:-1]
! ellipses_size = self.stringsize(ellipses, font,
ptsize)[0]
lines[line_number] += ellipses
break
rest_words = string[i:len(string)]
--- 1026,1037 ----
occupied_size -= char_size
lines[line_number] = lines[line_number][0:len_line-j]
+ occupied_size = self.stringsize( lines[line_number], font,
ptsize )[0]
if ellipses:
! while ellipses and \
! (occupied_size + self.stringsize(ellipses, font,
ptsize)[0]) \
! >= width:
! ellipses = ellipses[:-1]
lines[line_number] += ellipses
+
break
rest_words = string[i:len(string)]
***************
*** 1041,1049 ****
for line in lines:
- # FIXME:
- # shorten line, maybe it's too long. It may be ellipses, but
- # sometimes it also too long, don't know why.
- #while line and self.stringsize(line, font, ptsize)[0] > width:
- # line = line[:-1]
if align_h == 'left':
x0 = x
--- 1048,1051 ----
-------------------------------------------------------
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
