[PD-cvs] pd/src desire.tk,1.1.2.600.2.342,1.1.2.600.2.343

[chunlee]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32563

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
font stuff..


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.342
retrieving revision 1.1.2.600.2.343
diff -C2 -d -r1.1.2.600.2.342 -r1.1.2.600.2.343
*** desire.tk	11 Aug 2007 07:31:19 -0000	1.1.2.600.2.342
--- desire.tk	11 Aug 2007 08:54:23 -0000	1.1.2.600.2.343
***************
*** 2497,2501 ****
  		$self item TEXT text [l+ $@textoffset [$self xy]] \
  		    -font [View_look $self font] -text $text \
! 		    -fill [View_look $self fg] -anchor nw -width [expr $fw*$@max_width]
  	}
  	$self update_size
--- 2497,2503 ----
  		$self item TEXT text [l+ $@textoffset [$self xy]] \
  		    -font [View_look $self font] -text $text \
! 		    -fill [View_look $self fg] -anchor nw -width [expr ($fw*$@max_width)-1]
! 		# set width with -1 because text item seem to be inclusive at wrap point
! 		# where as the text widget is exclusive
  	}
  	$self update_size
***************
*** 2537,2542 ****
--- 2539,2546 ----
  	#set z [$@canvas zoom]
  	set z 1
+ 	set font_height [font metrics [$self look font] -linespace]
  	if {[$c bbox ${self}TEXT] != ""} {
  		mset {ix1 iy1 ix2 iy2} [$c bbox ${self}TEXT]
+ 		if {$iy2-$iy1 > $font_height} {set @multi 1}
  	} else {
  		set ix1 0; set iy1 0
***************
*** 2571,2575 ****
  	set pix_width [$t count -update -xpixels "1.0" "1.0 lineend"]
  	mset {width height} [$self get_size $pix_width $pix_height]
! 	$t configure -width [expr [min $width $@max_width]+1] -height $height -wrap word
  }
  
--- 2575,2579 ----
  	set pix_width [$t count -update -xpixels "1.0" "1.0 lineend"]
  	mset {width height} [$self get_size $pix_width $pix_height]
! 	$t configure -width [min $width $@max_width] -height $height -wrap word
  }