[PD-cvs] pd/src desire.tk,1.1.2.43,1.1.2.44

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
objectbox no longer square


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.43
retrieving revision 1.1.2.44
diff -C2 -d -r1.1.2.43 -r1.1.2.44
*** desire.tk	13 Sep 2005 09:32:16 -0000	1.1.2.43
--- desire.tk	13 Sep 2005 10:29:37 -0000	1.1.2.44
***************
*** 1322,1329 ****
  	global look font
  	set name_len [string length $text]
! 	set sx [expr ($font(width) * ($name_len+1) + $font(padx))]
! 	set sy [expr $font(height) + $font(pady)]
! 	set @sx sx
! 	set @sy sy
  	objectbox_draw $self $canvas
  	text ${canvas}.${self}text -height 1 -width $name_len -relief flat \
--- 1322,1329 ----
  	global look font
  	set name_len [string length $text]
! 	set xs [expr ($font(width) * ($name_len+1) + $font(padx))]
! 	set ys [expr $font(height) + $font(pady)]
! 	set @xs $xs
! 	set @ys $ys
  	objectbox_draw $self $canvas
  	text ${canvas}.${self}text -height 1 -width $name_len -relief flat \
***************
*** 1331,1337 ****
  	-font [format -*-courier-medium--normal--%d-* $font_size] \
  
! 	set _(self) $self
  	bind ${canvas}.${self}text <KeyRelease> {
! 		pdtk_text_key $canvas.c $_(self) %W %x %y %K %A 0
  	}
  
--- 1331,1338 ----
  	-font [format -*-courier-medium--normal--%d-* $font_size] \
  
! 	set _(focus) $self
  	bind ${canvas}.${self}text <KeyRelease> {
! 		pdtk_text_key $canvas.c $_(focus) %W %x %y %K %A 0
! 		#pdtk_text_key $canvas.c $self %W %x %y %K %A 0
  	}
  
***************
*** 1365,1371 ****
  	#puts "name_len: $name_len"
  	#puts "$self:state -> $@state"
! 
! 	set _($self:sx) [expr ($font(width) * ($name_len+1) + $font(padx))]
! 	set _($self:sy) [expr $font(height) + $font(pady)]
  	objectbox_draw $self $canvas
  }
--- 1366,1375 ----
  	#puts "name_len: $name_len"
  	#puts "$self:state -> $@state"
! 	
! 	set xs [expr ($font(width) * ($name_len+1) + $font(padx))]
! 	set ys [expr $font(height) + $font(pady)]
! 	set _($self:xs) $xs
! 	set _($self:ys) $ys
! 	
  	objectbox_draw $self $canvas
  }
***************
*** 1416,1421 ****
  	#puts "self:selection: [lindex $_($canvas_id:selection) 0]"
  	#puts "set $self:isnew -> $@isnew"
! 	set @sx [expr $font(width) + $font(padx)]
! 	set @sy [expr $font(height) + $font(pady)]
  	objectbox_draw $self $canvas
  	text_create $self $canvas $font(size) ""
--- 1420,1426 ----
  	#puts "self:selection: [lindex $_($canvas_id:selection) 0]"
  	#puts "set $self:isnew -> $@isnew"
! 	set @xs [expr $font(width) + $font(padx)]
! 	set @ys [expr $font(height) + $font(pady)]
! 	
  	objectbox_draw $self $canvas
  	text_create $self $canvas $font(size) ""