[PD-cvs] pd/src desire.tk, 1.1.2.600.2.127, 1.1.2.600.2.128 TODO, 1.1.2.28.2.16, 1.1.2.28.2.17

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk TODO 
Log Message:
fix FloatBox variable width, do_auto_apply


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.127
retrieving revision 1.1.2.600.2.128
diff -C2 -d -r1.1.2.600.2.127 -r1.1.2.600.2.128
*** desire.tk	20 Dec 2006 05:05:48 -0000	1.1.2.600.2.127
--- desire.tk	20 Dec 2006 15:58:42 -0000	1.1.2.600.2.128
***************
*** 2201,2205 ****
  
  def TextBox update_size {} {
! 	if {([$self class] == "FloatBox" || [$self class] == "NumBox") && $@w} {return}
  	if {[info exists @gop]} {if {$@gop} {set @xs $@pixwidth; set @ys $@pixheight; return}}
  	set l {};set nl 1
--- 2201,2211 ----
  
  def TextBox update_size {} {
! 	set width [font measure [$self look font] W]
! 	set ls [font metrics [$self look font] -linespace]
! 	if {([$self class] == "FloatBox" || [$self class] == "NumBox") && $@w} {
! 		set @xs [expr ($width*$@w)+3]
! 		set @ys [expr $ls+3]
! 		return
! 	}
  	if {[info exists @gop]} {if {$@gop} {set @xs $@pixwidth; set @ys $@pixheight; return}}
  	set l {};set nl 1
***************
*** 2210,2215 ****
  	set c [$self cwidget]
  	set t $c.${self}text
! 	set width [font measure [$self look font] W]
! 	set ls [font metrics [$self look font] -linespace]
  	if {[winfo exists $c.${self}text]} {
  		set nl [lindex [$t configure -height] 4]
--- 2216,2221 ----
  	set c [$self cwidget]
  	set t $c.${self}text
! 	#set width [font measure [$self look font] W]
! 	#set ls [font metrics [$self look font] -linespace]
  	if {[winfo exists $c.${self}text]} {
  		set nl [lindex [$t configure -height] 4]
***************
*** 2933,2937 ****
  	netsend [list #X pop 1]
  }
! 
  def Canvas paste_coords {mess offset} {
  	set x [lindex $mess 2]; set y [lindex $mess 3]
--- 2939,2943 ----
  	netsend [list #X pop 1]
  }
!  
  def Canvas paste_coords {mess offset} {
  	set x [lindex $mess 2]; set y [lindex $mess 3]
***************
*** 4536,4539 ****
--- 4542,4546 ----
  	frame $f.buttonsep2 -height 2 -borderwidth 1 -relief sunken
  	pack $f.auto_apply $f.buttonsep2 -side bottom -fill x
+ 	bind $f <KeyPress-Return> "break";#so that Return don't call do_auto_apply after Dialog ok
  	bind $f <KeyPress> "after 1 $self do_auto_apply"
  	bind $f <Button>   "after 1 $self do_auto_apply"
***************
*** 4740,4744 ****
  	    {snd entry -width 20} \
  	    {rcv entry -width 20}
! 	foreach name {w min max} {bind .$self.$name.entry <KeyPress-Return> "$self ok"}
  	.$self.w.entry select from 0
  	.$self.w.entry select adjust end
--- 4747,4751 ----
  	    {snd entry -width 20} \
  	    {rcv entry -width 20}
! 	#foreach name {w min max} {bind .$self.$name.entry <KeyPress-Return> "$self ok"}
  	.$self.w.entry select from 0
  	.$self.w.entry select adjust end
***************
*** 7300,7304 ****
          set directory [string range $filename 0 [expr [string last / $filename]-1]]
          set pd_opendir $directory
!         netsend [list $target callback [pdtk_enquote $filename]]
      }
  }
--- 7307,7311 ----
          set directory [string range $filename 0 [expr [string last / $filename]-1]]
          set pd_opendir $directory
!         netsend [list $target callback [enquote $filename]]
      }
  }
***************
*** 7311,7315 ****
      }
      if {$filename != ""} {
!         netsend [list $target callback [pdtk_enquote $filename]]
      }
  }
--- 7318,7322 ----
      }
      if {$filename != ""} {
!         netsend [list $target callback [enquote $filename]]
      }
  }

Index: TODO
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v
retrieving revision 1.1.2.28.2.16
retrieving revision 1.1.2.28.2.17
diff -C2 -d -r1.1.2.28.2.16 -r1.1.2.28.2.17
*** TODO	20 Dec 2006 04:03:26 -0000	1.1.2.28.2.16
--- TODO	20 Dec 2006 15:58:44 -0000	1.1.2.28.2.17
***************
*** 2,6 ****
  
  ---------------------------------------------------------------- 0.40.pre6
! 
  ---------------------------------------------------------------- 0.40.pre7-...
  
--- 2,9 ----
  
  ---------------------------------------------------------------- 0.40.pre6
! [ ] -lib in .ddrc crashes server: http://pastebin.ca/286300
! [ ] server don't pick up changes via NumBox reload, ie the width: 
!     <- .x8068058 reload 2 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 256;
!     -> change x8068058 x8067c50 {#X obj 335 166 nbx 8 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 256;}
  ---------------------------------------------------------------- 0.40.pre7-...