Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20547
Modified Files: Tag: devel_0_39 desire.tk TODO Log Message:
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.105 retrieving revision 1.1.2.106 diff -C2 -d -r1.1.2.105 -r1.1.2.106 *** desire.tk 5 Nov 2005 13:47:11 -0000 1.1.2.105 --- desire.tk 5 Nov 2005 18:34:32 -0000 1.1.2.106 *************** *** 1193,1202 **** }
def* textbox update_size {} { ! global font ! ##added +1 below that fixs the initial box size on my side - chun ! #set @xs [expr $font(padx)+$font(width)*([string length $@text]+1-$@valid)] ! set @xs [expr $font(padx)+$font(width)*([string length $@text] +$@edit)] set @ys [expr $font(pady)+$font(height)] }
--- 1193,1209 ---- }
+ proc max {x y} {if {$x>$y} {return $x} {return $y}} + def* textbox update_size {} { ! global font look ! set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)] ! set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * $look(iowidth)] ! set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * $look(iowidth)] ! set @xs [max $@bottomwidth [max $@topwidth $@textwidth]] set @ys [expr $font(pady)+$font(height)] + #puts "inlet = $@ninlets/$@topwidth | \ + # outlet = $@noutlets/$@bottomwidth | \ + # text = [string length $@text]/$@textwidth | \ + # objectwidth = $@xs" }
*************** *** 1574,1579 **** set c .x[$self canvas].c mset {type id} [$self identify_target $x $y $b $f "click"] if {$f&8} {post "right click!"; return} ! if {![llength $id]} { $self deselect_all set @action rect --- 1581,1588 ---- set c .x[$self canvas].c mset {type id} [$self identify_target $x $y $b $f "click"] + puts "object_in_edit: $@obj_in_edit id:$id" if {$f&8} {post "right click!"; return} ! # if clicked on empty space in edit mode and no object is in edit, draw dash sel rect ! if {![llength $id] && ![llength $@obj_in_edit]} { $self deselect_all set @action rect
Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** TODO 4 Nov 2005 02:15:30 -0000 1.1.2.4 --- TODO 5 Nov 2005 18:34:32 -0000 1.1.2.5 *************** *** 7,11 **** [h] fix the new canvas default so that its in edit mode when created -done [h] get the object box to render correctly after editing/recreating -done ! [h] objectbox atuo resize the minimum one required for the chars the minimum one required for the inlets/outlets --- 7,11 ---- [h] fix the new canvas default so that its in edit mode when created -done [h] get the object box to render correctly after editing/recreating -done ! [h] objectbox atuo resize -done the minimum one required for the chars the minimum one required for the inlets/outlets
-
chunlee