suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved spacing of drawing slightly

Browse Source 
svn: r9842
This commit is contained in:
Robby Findler 2008-05-15 02:41:38 +00:00
parent 0dbc57a309
commit faee206b19
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
collects/mrlib/switchable-button.ss
View File

@ -7,6 +7,7 @@
(define margin 2) (define margin 2)
(define w-circle-space 6) (define w-circle-space 6)
(define h-circle-space 6) (define h-circle-space 6)
(define rhs-pad 2) ;; extra space outside the bitmap, but inside the mouse highlighting (on the right)
(define half-gray (make-object color% 127 127 127)) (define half-gray (make-object color% 127 127 127))
(define one-fifth-gray (make-object color% 200 200 200)) (define one-fifth-gray (make-object color% 200 200 200))
@ -207,7 +208,10 @@
(cond (cond
[with-label? [with-label?
(let-values ([(tw th _1 _2) (send dc get-text-extent label)]) (let-values ([(tw th _1 _2) (send dc get-text-extent label)])
(let ([text-start (+ (/ cw 2) (- (/ tw 2)) (- (/ (send bitmap get-width) 2)))]) (let ([text-start (+ (/ cw 2)
(- (/ tw 2))
(- (/ (send bitmap get-width) 2))
(- rhs-pad))])
(send dc draw-text label text-start (- (/ ch 2) (/ th 2))) (send dc draw-text label text-start (- (/ ch 2) (/ th 2)))
(draw-the-bitmap (+ text-start tw gap) (- (/ ch 2) (/ (send bitmap get-height) 2)))))] (draw-the-bitmap (+ text-start tw gap) (- (/ ch 2) (/ (send bitmap get-height) 2)))))]
[else [else
@ -242,7 +246,7 @@
(cond (cond
[with-label? [with-label?
(let-values ([(w h _1 _2) (send dc get-text-extent label normal-control-font)]) (let-values ([(w h _1 _2) (send dc get-text-extent label normal-control-font)])
(do-w/h (+ w gap (send bitmap get-width)) (do-w/h (+ w gap (send bitmap get-width) rhs-pad)
(max h (send bitmap get-height))))] (max h (send bitmap get-height))))]
[else [else
(do-w/h (send alternate-bitmap get-width) (do-w/h (send alternate-bitmap get-width)
@ -281,7 +285,7 @@
(send bdc set-bitmap #f) (send bdc set-bitmap #f)
disable-bm)))) disable-bm))))
#;
(begin (begin
(define f (new frame% [label ""])) (define f (new frame% [label ""]))
(define vp (new vertical-pane% [parent f])) (define vp (new vertical-pane% [parent f]))