From 1c1e36621a1e89115a36c1e3f1b0ba6c85004022 Mon Sep 17 00:00:00 2001 From: Slava Pestov <slava@slava-pestovs-macbook-pro.local> Date: Sun, 11 Jan 2009 19:40:17 -0600 Subject: [PATCH] Small cleanup for ui.gadgets.labels --- basis/ui/gadgets/labels/labels.factor | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor index 5706f47639..eff3c6f7bb 100644 --- a/basis/ui/gadgets/labels/labels.factor +++ b/basis/ui/gadgets/labels/labels.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2005, 2008 Slava Pestov. +! Copyright (C) 2005, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays hashtables io kernel math namespaces make opengl sequences strings splitting ui.gadgets @@ -12,11 +12,7 @@ TUPLE: label < gadget text font color ; text>> dup string? [ "\n" join ] unless ; inline : set-label-string ( string label -- ) - CHAR: \n pick memq? [ - [ string-lines ] dip (>>text) - ] [ - (>>text) - ] if ; inline + [ CHAR: \n over memq? [ string-lines ] when ] dip (>>text) ; inline : label-theme ( gadget -- gadget ) sans-serif-font >>font