[PD-cvs] pd/src u_main.tk,1.25.6.9,1.25.6.10
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Wed Nov 14 01:13:49 CET 2007
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25392
Modified Files:
Tag: branch-v0-40-extended
u_main.tk
Log Message:
checked in changes from patch #1551825 to fix bug #1830767
Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.25.6.9
retrieving revision 1.25.6.10
diff -C2 -d -r1.25.6.9 -r1.25.6.10
*** u_main.tk 13 Nov 2007 23:52:55 -0000 1.25.6.9
--- u_main.tk 14 Nov 2007 00:13:47 -0000 1.25.6.10
***************
*** 1076,1081 ****
-orient horizontal
! pack $name.scrollhort -side bottom -fill x
! pack $name.scrollvert -side right -fill y
pack $name.c -side left -expand 1 -fill both
wm minsize $name 50 20
--- 1076,1081 ----
-orient horizontal
! # pack $name.scrollhort -side bottom -fill x
! # pack $name.scrollvert -side right -fill y
pack $name.c -side left -expand 1 -fill both
wm minsize $name 50 20
***************
*** 1365,1369 ****
# We don't handle multiple clicks yet.
! bind $name.c <Configure> { pdtk_canvas_autoscrollbars %W %w %h }
bind $name.c <Button> {pdtk_canvas_click %W %x %y %b 0}
bind $name.c <Shift-Button> {pdtk_canvas_click %W %x %y %b 1}
--- 1365,1369 ----
# We don't handle multiple clicks yet.
! bind $name.c <Configure> { pdtk_canvas_getscroll %W }
bind $name.c <Button> {pdtk_canvas_click %W %x %y %b 0}
bind $name.c <Shift-Button> {pdtk_canvas_click %W %x %y %b 1}
***************
*** 1758,1761 ****
--- 1758,1774 ----
if {$x2 > 100} {set xmaxval $x2}
if {$y2 > 100} {set ymaxval $y2}
+
+ set parentname [winfo parent $name]
+ set winwidth [winfo width $parentname]
+ set winheight [winfo height $parentname]
+ set canvaswidth [ expr {abs($xminval)+$xmaxval} ]
+ set canvasheight [ expr {abs($yminval)+$ymaxval} ]
+
+ if {$winwidth > $canvaswidth} {pack forget $parentname.scrollhort}
+ if {$winheight > $canvasheight} {pack forget $parentname.scrollvert}
+ if {$winwidth < $canvaswidth} {pack $parentname.scrollhort -fill x \
+ -side bottom -before $parentname.c}
+ if {$winheight < $canvasheight} {pack $parentname.scrollvert -fill y \
+ -side right -before $parentname.c}
if {$pdtk_canvas_mouseup_name != $name || \
***************
*** 2027,2032 ****
pack $name.radiof.radio36 -side top -anchor w
! set current_radiobutton [format "$name.radiof.radio%d" $initsize]
! $current_radiobutton select
frame $name.stretchf
--- 2040,2045 ----
pack $name.radiof.radio36 -side top -anchor w
! set current_radiobutton [format "$name.radiof.radio%d" $initsize]
! $current_radiobutton select
frame $name.stretchf
More information about the Pd-cvs
mailing list