Revert "ui.gadgets.labels: use font-metrics directly."

This reverts commit d9fdd71d64.
2012-09-18 09:19:29 -07:00 · 2012-09-18 09:19:29 -07:00 · b80992b27a
parent 4c53c971c1
commit b80992b27a
1 changed files with 9 additions and 2 deletions
--- a/basis/ui/gadgets/labels/labels.factor
+++ b/basis/ui/gadgets/labels/labels.factor
@ -52,11 +52,18 @@ M: label string<< ( string label -- )
 M: label pref-dim*
    >label< text-dim ;

+<PRIVATE
+
+: label-metrics ( label -- metrics )
+    >label< dup string? [ first ] unless line-metrics ;
+
+PRIVATE>
+
 M: label baseline
-    font>> font-metrics ascent>> round ;
+    label-metrics ascent>> round ;

 M: label cap-height
-    font>> font-metrics cap-height>> round ;
+    label-metrics cap-height>> round ;

 M: label draw-gadget*
    >label<