diff --git a/basis/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor index dc238698a8..7ca7f0816f 100644 --- a/basis/ui/gadgets/menus/menus.factor +++ b/basis/ui/gadgets/menus/menus.factor @@ -4,7 +4,7 @@ USING: accessors colors.constants kernel locals math.rectangles math.vectors namespaces opengl sequences sorting ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.corners ui.gadgets.frames ui.gadgets.glass ui.gadgets.packs -ui.gadgets.worlds ui.gestures ui.operations ui.pens +ui.gadgets.worlds ui.tools.common ui.gestures ui.operations ui.pens ui.pens.solid ui.render ; IN: ui.gadgets.menus @@ -22,6 +22,9 @@ M:: object ( target hook command -- button ) separator-pen @@ -32,9 +35,7 @@ M: separator-pen draw-interior [ v>integer ] bi@ gl-line ; : ( items -- gadget ) - [ ] dip add-gadgets - { 3 3 } - panel-background-color >>interior ; + [ ] dip add-gadgets ; PRIVATE> @@ -44,18 +45,14 @@ M: ---- 3drop { 0 5 } >>dim - COLOR: black >>interior ; - -: menu-theme ( gadget -- gadget ) - COLOR: light-gray >>interior ; + menu-border-color >>interior ; : ( gadgets -- menu ) - frame "menu-background" [ - /-----\ - |-----| - \-----/ - ] make-corners ; + { 0 3 } >>gap + margins + menu-border-color >>boundary + menu-background-color >>interior ; : ( target hook commands -- menu ) [ ] 2with map ;