[PD-cvs] pd/src desire.tk,1.1.2.388,1.1.2.389

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
somemore crosshair fix....


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.388
retrieving revision 1.1.2.389
diff -C2 -d -r1.1.2.388 -r1.1.2.389
*** desire.tk	20 Aug 2006 22:50:52 -0000	1.1.2.388
--- desire.tk	21 Aug 2006 01:52:03 -0000	1.1.2.389
***************
*** 2426,2430 ****
      set c .$self.c
      set size [$c bbox all]
! #    set size [$c bbox $@children]
      if {$size != ""} {
  	mset {xmin ymin xmax ymax} {0 0 100 100}
--- 2426,2431 ----
      set c .$self.c
      set size [$c bbox all]
!     #set size [$c bbox $@children]
!     #set size [eval [concat [list $c bbox] $@children]]
      if {$size != ""} {
  	mset {xmin ymin xmax ymax} {0 0 100 100}
***************
*** 4365,4368 ****
--- 4366,4371 ----
  	set height [expr [winfo height $c]/$@scale]
  	mset {x1 y1 x2 y2} [$c cget -scrollregion]
+ 	set x1 [expr $x1/$@scale]
+ 	set y1 [expr $y1/$@scale]
  	mset {vx1 vx2} [$c xview]
  	mset {vy1 vy2} [$c yview]
***************
*** 4385,4393 ****
  	  }
  	}
! 	#set v1 [list $x $vy1 $x $vy2]
! 	#set h1 [list $vx1 $y $vx2 $y]
! 	set v1 [list $x [expr $y - $y + $yoff] $x [expr $y + ($height +$yoff)]]
! 	set h1 [list [expr $x - $x + $xoff] $y [expr $x + ($width +$xoff)] $y]
! 	#$self item BORDER rect [list $vx1 $vy1 $vx2 $vy2] -width 10
  	$self item VHAIR1 line $v1 -fill [look selectframe] -width 0.5 -dash {4 4 4 4}
  	$self item HHAIR1 line $h1 -fill [look selectframe] -width 0.5 -dash {4 4 4 4}
--- 4388,4394 ----
  	  }
  	}
! 	
! 	set v1 [list $x $y1 $x [expr $y + ($height +$yoff)]]
! 	set h1 [list $x1 $y [expr $x + ($width +$xoff)] $y]
  	$self item VHAIR1 line $v1 -fill [look selectframe] -width 0.5 -dash {4 4 4 4}
  	$self item HHAIR1 line $h1 -fill [look selectframe] -width 0.5 -dash {4 4 4 4}
***************
*** 4401,4404 ****
--- 4402,4406 ----
  	set height [expr [winfo height $c]/$@scale]
  	mset {x1 y1 x2 y2} [$c cget -scrollregion]
+ 	
  	mset {vx1 vx2} [$c xview]
  	mset {vy1 vy2} [$c yview]