[PD-cvs] pd/src desire.tk,1.1.2.360,1.1.2.361

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fixed font (zoom) in FloatAtom,SymbolAtom
removed some extraneous selected?=


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.360
retrieving revision 1.1.2.361
diff -C2 -d -r1.1.2.360 -r1.1.2.361
*** desire.tk	17 Aug 2006 23:14:38 -0000	1.1.2.360
--- desire.tk	18 Aug 2006 00:03:01 -0000	1.1.2.361
***************
*** 1070,1074 ****
  def* View erase {} {$self item_delete}
  def View selected?  {}  {return $@selected?}
! def View selected?= {x} {set @selected? $x; $self changed}
  
  def* View select {state} {
--- 1070,1074 ----
  def* View erase {} {$self item_delete}
  def View selected?  {}  {return $@selected?}
! def View selected?= {x} {set @selected? $x; $self changed} ;# only call this from selection= and such
  
  def* View select {state} {
***************
*** 1572,1584 ****
  
  def TextBox draw {} {
-     $self update_size
-     # TEXT = the text label
-     # text = the input text field
-     # confusing?;)
      global font
      super
      mset {x1 y1} [$self xy]
! 	set l {}
! 	foreach char [split $@text ""] {lappend l [scan $char %c]}
      if {$@edit} {
  	set t .$@canvas.c.${self}text
--- 1572,1582 ----
  
  def TextBox draw {} {
      global font
+     $self update_size
+     # "TEXT" is the text label while "text" is the the input text field tk widget
      super
      mset {x1 y1} [$self xy]
!     set l {}
!     foreach char [split $@text ""] {lappend l [scan $char %c]}
      if {$@edit} {
  	set t .$@canvas.c.${self}text
***************
*** 3043,3046 ****
--- 3041,3045 ----
  			set _($self:$f) [lindex $mess $i]; incr i}}
  	}
+ 	#!@#$ goes with the request tracking feature to be impl in the server
  	if {[info exists canvas(msg_isnew)]} {
  		set _($self:isnew) 1
***************
*** 3140,3143 ****
--- 3139,3143 ----
  
  def AtomBox draw {} {
+ 	global font
  	super
  	mset {x1 y1} [$self xy]
***************
*** 3148,3152 ****
  		set string [string range $@text 0 [expr $@w-1]]
  	}
! 	$self item TEXT text [l+ {2 2} [list $x1 $y1]] -anchor nw -text $string \
  }
  
--- 3148,3153 ----
  		set string [string range $@text 0 [expr $@w-1]]
  	}
! 	$self item TEXT text [l+ {2 2} [list $x1 $y1]] \
! 		-text $string -fill [look objectfg] -font $font(str) -anchor nw
  }
  
***************
*** 3441,3445 ****
  	global font
  	super
! 	set @clicking 0
  	set @val 0
  	set @old_val 0
--- 3442,3446 ----
  	global font
  	super
! 	set @clicking 0 ;#!@#$ get rid of this
  	set @val 0
  	set @old_val 0
***************
*** 3459,3466 ****
  			$@canvas focus= ""
  			pd .$self set [$self canonize $@val]
- 			#pd .$self set $@val
- 			#pd .$self bang
  			set @text $@val
- 			$self selected?= 0
  			set @clicking 0
  			set @old_val $@val
--- 3460,3464 ----
***************
*** 3484,3493 ****
  		minus {set @val "-"; set @text $@val; $self changed}
  		default {
! 			if {[regexp {^[0-9]{1}$} $key]} {
! 				if {[string length $@val] < $@w} {
! 				 	append @val $key
! 				 	set @text $@val
! 				 	$self changed
! 				}
  			}
  		}
--- 3482,3489 ----
  		minus {set @val "-"; set @text $@val; $self changed}
  		default {
! 			if {[regexp {^[0-9]{1}$} $key] && [string length $@val] < $@w} {
! 			 	append @val $key
! 			 	set @text $@val
! 			 	$self changed
  			}
  		}
***************
*** 3544,3548 ****
  	set @rate [expr $f&1 ? 0.01 : 1.00]
  	set @clicking 1
- 	$self selected?= 1
  }
  
--- 3540,3543 ----
***************
*** 3556,3560 ****
  	} { 
  		$@canvas focus= ""
- 		$self selected?= 0
  		if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val}
  	}
--- 3551,3554 ----
***************
*** 3690,3694 ****
  		$@canvas focus= ""
  		.$@canvas.c itemconfigure ${self}BASE4 -fill [look objectbg]
- 		$self selected?= 0
  		if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val}
  	}
--- 3684,3687 ----