ui.gadgets: add some inline.

diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor
index 1695078bb9b88d253e359738d1dbc78d65b9044b..c0eb5266b5906ca1d797232b772b55ad1fcff04b 100644 (file)
--- 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 )
-    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 ;
 
 <PRIVATE
@@ -189,7 +189,7 @@ GENERIC: pref-dim* ( gadget -- dim )
         [ drop ] [ dupd pref-dim<< ] if
     ] ?if ;
 
-: pref-dims ( gadgets -- seq ) [ pref-dim ] map ;
+: pref-dims ( gadgets -- seq ) [ pref-dim ] map ; inline
 
 M: gadget pref-dim* dim>> ;
 

diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor
index 42af2b92d07520f8bd9b41290ddca660e97341e7..0b4c060633fb4fe33aab02784d754a5c305b0c02 100644 (file)
--- 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 8c50d79c2f8f8a8cea572e085c7c26455290da99..fee7ffd96dd1d9c4eac09c15dbf1b3b94a64fca6 100644 (file)
--- 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>