Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4418
Modified Files: Tag: desiredata desire.tk Log Message: zoom fixed for opened gop
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.110 retrieving revision 1.1.2.600.2.111 diff -C2 -d -r1.1.2.600.2.110 -r1.1.2.600.2.111 *** desire.tk 19 Dec 2006 05:44:52 -0000 1.1.2.600.2.110 --- desire.tk 19 Dec 2006 13:20:39 -0000 1.1.2.600.2.111 *************** *** 1204,1216 **** # inheritance problem: this doesn't work for Wire, which doesn't store its positions def View xy {} { - # todo: should compute GOP stuff here if {$@canvas == ""} {return [list $@x1 $@y1]} ! if {[$@canvas gop] && ![winfo exists .$@canvas.c]} { ! mset {xmargin ymargin} [$@canvas margin] ! mset {x y} [$@canvas xy] ! list [expr {($@x1-$xmargin)+$x}] [expr {($@y1-$ymargin)+$y}] ! } else { ! list $@x1 $@y1 ! } }
--- 1204,1215 ---- # inheritance problem: this doesn't work for Wire, which doesn't store its positions def View xy {} { if {$@canvas == ""} {return [list $@x1 $@y1]} ! if {[$@canvas gop]} { ! if {[focus] != ".$@canvas.c"} { ! mset {xmargin ymargin} [$@canvas margin] ! mset {x y} [$@canvas xy] ! list [expr {($@x1-$xmargin)+$x}] [expr {($@y1-$ymargin)+$y}] ! } else {list $@x1 $@y1} ! } else {list $@x1 $@y1} }
*************** *** 1232,1235 **** --- 1231,1237 ---- if {$canvas == ""} {return ""} while {![winfo exists [$canvas widget]]} {set canvas [$canvas canvas]} + if {[regexp {x[0-9a-f]{6,8}} [focus] focus]} { + if {$focus != $canvas} {set canvas $focus} + } return $canvas } *************** *** 2050,2056 ****
def Canvas draw {} { - #if {$@subpatch && $@canvas != "" && !$@gop} {if {![winfo exists [$self widget]]} {super}} ;# is for the [pd] box if applicable if {$@subpatch && $@canvas != "" && !$@gop} {super} ;# is for the [pd] box if applicable ! if {$@gop && ![winfo exists [$self widget]]} {super; $self restack; return} if {$@abs} {super; return} if {!$@mapped} {return} --- 2052,2060 ----
def Canvas draw {} { if {$@subpatch && $@canvas != "" && !$@gop} {super} ;# is for the [pd] box if applicable ! if {$@gop} { ! #if {![winfo exists [$self widget]]} {super; return} ! if {[focus] != [$self widget]} {super;return} ! } if {$@abs} {super; return} if {!$@mapped} {return} *************** *** 2061,2067 **** if {[llength $@children] != 1 && \ [[lindex $@children 0] class] != "Array"} {$self gop_rect} - # $self gop_rect } - }
--- 2065,2069 ---- *************** *** 3031,3035 **** netsend [list .$self map 1] $self init_window ! $self redraw }
--- 3033,3037 ---- netsend [list .$self map 1] $self init_window ! #$self redraw }
*************** *** 3768,3772 **** $spinbox set $per% set @zoom [expr $per/100.0] ;# @zoom must be float, not int ! $self propagate_zoom $@zoom $self redraw foreach child $@children { --- 3770,3774 ---- $spinbox set $per% set @zoom [expr $per/100.0] ;# @zoom must be float, not int ! #$self propagate_zoom $@zoom $self redraw foreach child $@children {