From ca8b8c5e766301f88aba35e90263d0d05315c62e Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 10 Jul 2010 09:45:49 -0500 Subject: [PATCH] modified the draw-button-label contract so that it would work with a let*-style scoping for ->d original commit: 476dd36eec345b439a97cc85047aba7f0dcf2957 --- collects/mrlib/name-message.rkt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/collects/mrlib/name-message.rkt b/collects/mrlib/name-message.rkt index 1d964cd3..d1ad4ccf 100644 --- a/collects/mrlib/name-message.rkt +++ b/collects/mrlib/name-message.rkt @@ -1,10 +1,5 @@ #lang racket/gui -;; min-w, min-h : number -> contract -;; determines if the widths and heights are suitable -(define (min-w h) (flat-named-contract "draw-button-label-width" (lambda (w) (w . > . (- h (* 2 border-inset)))))) -(define (min-h w) (flat-named-contract "draw-button-label-height" (lambda (h) (h . > . (* 2 border-inset))))) - (provide/contract [get-left-side-padding (-> number?)] [pad-xywh (-> number? number? (>=/c 0) (>=/c 0) @@ -14,13 +9,14 @@ [label (or/c false/c string?)] [x number?] [y number?] - [w (and/c number? (min-w h))] - [h (and/c number? (min-h w))] + [w number?] + [h (and/c number? (>=/c (* 2 border-inset)))] [mouse-over? boolean?] [grabbed? boolean?] [button-label-font (is-a?/c font%)] [bkg-color (or/c false/c (is-a?/c color%) string?)]) - () + #:pre-cond + (w . > . (- h (* 2 border-inset))) [result void?])] [calc-button-min-sizes