[PD-cvs] pd/src desire.tk,1.1.2.110,1.1.2.111
chunlee
chunlee at users.sourceforge.net
Tue Nov 8 02:56:43 CET 2005
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv895
Modified Files:
Tag: devel_0_39
desire.tk
Log Message:
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.110
retrieving revision 1.1.2.111
diff -C2 -d -r1.1.2.110 -r1.1.2.111
*** desire.tk 7 Nov 2005 01:26:53 -0000 1.1.2.110
--- desire.tk 8 Nov 2005 01:56:41 -0000 1.1.2.111
***************
*** 1172,1178 ****
--- 1172,1183 ----
$self update_size
$self changed
+ #puts "................w:[expr [string length $@text]+1]"
text $t -height 1 -width [expr [string length $@text]+1] -relief flat \
-bg ${look(objectbg)} -borderwidth 0 \
-font [format -*-courier-medium--normal--%d-* $font(size)]
+ #puts "...............chars:$@textchars"
+ #text $t -height 1 -width $@textchars -relief flat \
+ # -bg ${look(objectbg)} -borderwidth 0 \
+ # -font [format -*-courier-medium--normal--%d-* $font(size)]
bind $t <Key> "$self key %W %x %y %K %A 0"
bind $t <Control-Return> "$self key %W %x %y 10 %A 0"
***************
*** 1206,1214 ****
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"
}
--- 1211,1222 ----
set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * $look(iowidth)]
set @xs [max $@bottomwidth [max $@topwidth $@textwidth]]
+ #set @textchars [expr int([max $@bottomwidth [max $@topwidth $@textwidth]]/$font(width)) + 1]
+ #puts "roundoff:$@textchars"
+ #set @xs [expr $@textchars * $font(width) - 2]
set @ys [expr $font(pady)+$font(height)]
! puts "inlet = $@ninlets/$@topwidth | \
! outlet = $@noutlets/$@bottomwidth | \
! text = [string length $@text]/$@textwidth | \
! objectwidth = $@xs"
}
***************
*** 1490,1494 ****
foreach tag $stack {
set tags [$c gettags $tag]
! if {[regexp {^([a-f0-9]{6,8})} $tags id]} {
global _
if {[info exists _($id:class)]} {set class $_($id:class)} {set class unknown}
--- 1498,1502 ----
foreach tag $stack {
set tags [$c gettags $tag]
! if {[regexp {^x([a-f0-9]{6,8})} $tags id]} {
global _
if {[info exists _($id:class)]} {set class $_($id:class)} {set class unknown}
More information about the Pd-cvs
mailing list