steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui.gadgets: remove dependence on ui.tools.common.

factor-shell
John Benediktsson 2017-10-25 15:56:40 -07:00
parent 59af2ae3d7
commit c2c879c999
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/ui/gadgets/labeled/labeled.factor
View File

@ -1,9 +1,8 @@
! Copyright (C) 2006, 2009 Slava Pestov, 2015 Nicolas Pénet. ! Copyright (C) 2006, 2009 Slava Pestov, 2015 Nicolas Pénet.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors colors.constants kernel system ui.gadgets USING: accessors kernel system ui.gadgets ui.gadgets.borders
ui.gadgets.borders ui.gadgets.labels ui.gadgets.packs ui.gadgets.labels ui.gadgets.packs ui.gadgets.tracks
ui.theme ui.gadgets.tracks ui.pens.gradient ui.pens.gradient ui.pens.solid ui.theme ;
ui.pens.solid ui.tools.common ;
IN: ui.gadgets.labeled IN: ui.gadgets.labeled
TUPLE: labeled-gadget < track content color ; TUPLE: labeled-gadget < track content color ;
@ -44,7 +43,7 @@ M: labeled-gadget focusable-child* content>> ;
PRIVATE> PRIVATE>
: <labeled-gadget> ( gadget title color -- labeled ) : <labeled-gadget> ( gadget title color -- labeled )
vertical labeled-gadget new-track with-lines vertical labeled-gadget new-track
swap >>color swap >>color
add-title-bar add-title-bar
swap >>content swap >>content

10
basis/ui/gadgets/menus/menus.factor
View File

@ -2,10 +2,10 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors combinators kernel locals math math.rectangles USING: accessors combinators kernel locals math math.rectangles
math.vectors memoize models namespaces opengl sequences sorting math.vectors memoize models namespaces opengl sequences sorting
ui.commands ui.gadgets ui.gadgets.buttons ui.gadgets.glass ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons
ui.gadgets.packs ui.gadgets.worlds ui.gadgets.wrappers ui.gestures ui.gadgets.glass ui.gadgets.packs ui.gadgets.worlds
ui.operations ui.pens ui.pens.solid ui.theme ui.tools.common ; ui.gadgets.wrappers ui.gestures ui.operations ui.pens
ui.pens.solid ui.theme ;
FROM: ui.gadgets.wrappers => wrapper ; FROM: ui.gadgets.wrappers => wrapper ;
IN: ui.gadgets.menus IN: ui.gadgets.menus
@ -140,7 +140,7 @@ menu H{
: <menu> ( gadgets -- menu ) : <menu> ( gadgets -- menu )
<menu-items> [ <menu-items> [
{ 0 3 } >>gap { 0 3 } >>gap
margins { 5 5 } <filled-border>
menu-border-color <solid> >>boundary menu-border-color <solid> >>boundary
menu-background <solid> >>interior menu-background <solid> >>interior
menu new-wrapper menu new-wrapper