From 45f0db5f788e2d4a1980cd4ac63ffba1ee69cf6d Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 17 Sep 2012 17:21:31 -0700 Subject: [PATCH] ui.gadgets: add some inline. --- basis/ui/gadgets/gadgets.factor | 6 +++--- basis/ui/gadgets/labels/labels.factor | 2 +- basis/ui/gadgets/packs/packs.factor | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor index 1695078bb9..c0eb5266b5 100644 --- a/basis/ui/gadgets/gadgets.factor +++ b/basis/ui/gadgets/gadgets.factor @@ -37,7 +37,7 @@ M: gadget model-changed 2drop ; : nth-gadget ( n gadget -- child ) children>> nth ; inline : ( -- gadget ) - gadget new ; + gadget new ; inline : control-value ( control -- value ) model>> value>> ; @@ -162,7 +162,7 @@ PRIVATE> [ drop ] [ dup invalidate layout-later ] if ; : show-gadget ( gadget -- ) t >>visible? drop ; - + : hide-gadget ( gadget -- ) f >>visible? drop ; > ; diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor index 42af2b92d0..0b4c060633 100644 --- a/basis/ui/gadgets/labels/labels.factor +++ b/basis/ui/gadgets/labels/labels.factor @@ -47,7 +47,7 @@ M: label string<< ( string label -- ) label new-label ; : >label< ( label -- font text ) - [ font>> ] [ text>> ] bi ; + [ font>> ] [ text>> ] bi ; inline M: label pref-dim* >label< text-dim ; diff --git a/basis/ui/gadgets/packs/packs.factor b/basis/ui/gadgets/packs/packs.factor index 8c50d79c2f..fee7ffd96d 100644 --- a/basis/ui/gadgets/packs/packs.factor +++ b/basis/ui/gadgets/packs/packs.factor @@ -78,13 +78,13 @@ M: pack pref-dim* dup children>> pref-dims pack-pref-dim ; : vertical-baseline ( pack -- y ) - children>> [ f ] [ first baseline ] if-empty ; + children>> [ f ] [ first baseline ] if-empty ; inline : horizontal-baseline ( pack -- y ) - children>> dup pref-dims measure-metrics drop ; + children>> dup pref-dims measure-metrics drop ; inline -: pack-cap-height ( pack -- n ) - children>> [ cap-height ] map ?supremum ; +: pack-cap-height ( pack -- n/f ) + children>> [ cap-height ] map ?supremum ; inline PRIVATE>