From 77def0bc962bd65ffc3c5f68f61c2a45d081e351 Mon Sep 17 00:00:00 2001 From: "U-SLAVA-DFB8FF805\\Slava" Date: Mon, 1 Dec 2008 17:53:17 -0600 Subject: [PATCH] was using each-line from io by accident, dont' even need io in USING: list here --- basis/ui/gadgets/editors/editors.factor | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) mode change 100644 => 100755 basis/ui/gadgets/editors/editors.factor diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor old mode 100644 new mode 100755 index ad81d18f92..e262ac7fea --- a/basis/ui/gadgets/editors/editors.factor +++ b/basis/ui/gadgets/editors/editors.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2006, 2008 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays documents io kernel math models +USING: accessors arrays documents kernel math models namespaces locals fry make opengl opengl.gl sequences strings io.styles math.vectors sorting colors combinators assocs math.order fry calendar alarms ui.clipboards ui.commands @@ -218,7 +218,7 @@ M: editor ungraft* ] with-editor-translation ; : selection-start/end ( editor -- start end ) - dup editor-mark* swap editor-caret* sort-pair ; + [ editor-mark* ] [ editor-caret* ] bi sort-pair ; : (draw-selection) ( x1 x2 -- ) over - @@ -227,9 +227,8 @@ M: editor ungraft* swap [ gl-fill-rect ] with-translation ; : draw-selected-line ( start end n -- ) - [ start/end-on-line ] keep tuck - [ editor get offset>x ] 2dip - editor get offset>x + [ start/end-on-line ] keep + tuck [ editor get offset>x ] 2bi@ (draw-selection) ; : draw-selection ( -- ) @@ -237,9 +236,9 @@ M: editor ungraft* editor get selection-start/end over first [ 2dup [ - [ 2dup ] dip draw-selected-line + draw-selected-line 1 translate-lines - ] each-line 2drop + ] with with each-line ] with-editor-translation ; M: editor draw-gadget*