pd/src desire.tk,1.1.2.136,1.1.2.137 - Pd-cvs

4 Dec 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25384
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
fixed [hsl], [vsl] draw
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.136
retrieving revision 1.1.2.137
diff -C2 -d -r1.1.2.136 -r1.1.2.137
*** desire.tk	4 Dec 2005 12:58:54 -0000	1.1.2.136
--- desire.tk	4 Dec 2005 16:58:16 -0000	1.1.2.137
***************
*** 2424,2428 ****
  }
! class_new slider {view}
  def slider orient {} {
    switch $@class {
--- 2424,2428 ----
  }
! class_new slider {bluebox}
  def slider orient {} {
    switch $@class {
***************
*** 2433,2436 ****
--- 2433,2437 ----
def* slider init {args} {
+ 	super
    set @clicking 0
  }
***************
*** 2447,2454 ****
    set outs [expr [string compare $@snd empty]==0]
    super
    set color [bluify #ffffff]
! 	$self item KNOB rectangle $x1 $y1 $x1 $y1 \
    	-outline #000000 -fill [darker $color]
! 	set {u1 v1 u2 v2} [$@canvas coords ${self}BASE]
    set span [expr $@max-$@min]
    set l [expr $orient?$@h:$@w]
--- 2448,2456 ----
    set outs [expr [string compare $@snd empty]==0]
    super
+ 	$self makebox $x1 $y1 $@w $@h $@ninlets $@noutlets
    set color [bluify #ffffff]
! 	$self item KNOB rectangle [list $x1 $y1 $x1 $y1] \
    	-outline #000000 -fill [darker $color]
! 	set c .$@canvas.c
    set span [expr $@max-$@min]
    set l [expr $orient?$@h:$@w]
***************
*** 2456,2469 ****
    set @value $value
    if {$orient} {
! 		set size [expr $u2-$x1]
! 		set y1 [expr $v2-$value*($l-1)/$span-2]
    	set y2 [expr $y1-2]
! 		$@canvas coords ${self}KNOB [expr $x1+2] $y1 [expr $x1+$size-2] $y2
    } {
! 		set size [expr $v2-$y1]
    	set x1 [expr $x1+$value*($l-1)/$span]
    	set x2 [expr $x1+2]
    	set y2 [expr $y1+$size]
! 		$@canvas coords ${self}KNOB $x1 [expr $y1+2] $x2 [expr $y1+$size-2]
    }
  }
--- 2458,2471 ----
    set @value $value
    if {$orient} {
! 		set size $xs
! 		set y1 [expr $y1+$ys-$value*($l-1)/$span-2]
    	set y2 [expr $y1-2]
! 		$c coords ${self}KNOB [expr $x1+2] $y1 [expr $x1+$size-2] $y2
    } {
! 		set size $ys
    	set x1 [expr $x1+$value*($l-1)/$span]
    	set x2 [expr $x1+2]
    	set y2 [expr $y1+$size]
! 		$c coords ${self}KNOB $x1 [expr $y1+2] $x2 [expr $y1+$size-2]
    }
  }