From c2c879c9997913a655c36ba750896e6627e4e650 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Wed, 25 Oct 2017 15:56:40 -0700
Subject: [PATCH] ui.gadgets: remove dependence on ui.tools.common.

---
 basis/ui/gadgets/labeled/labeled.factor |  9 ++++-----
 basis/ui/gadgets/menus/menus.factor     | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/basis/ui/gadgets/labeled/labeled.factor b/basis/ui/gadgets/labeled/labeled.factor
index da26fb5710..22c4e95205 100644
--- a/basis/ui/gadgets/labeled/labeled.factor
+++ b/basis/ui/gadgets/labeled/labeled.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2006, 2009 Slava Pestov, 2015 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors colors.constants kernel system ui.gadgets
-ui.gadgets.borders ui.gadgets.labels ui.gadgets.packs
-ui.theme ui.gadgets.tracks ui.pens.gradient
-ui.pens.solid ui.tools.common ;
+USING: accessors kernel system ui.gadgets ui.gadgets.borders
+ui.gadgets.labels ui.gadgets.packs ui.gadgets.tracks
+ui.pens.gradient ui.pens.solid ui.theme ;
 IN: ui.gadgets.labeled
 
 TUPLE: labeled-gadget < track content color ;
@@ -44,7 +43,7 @@ M: labeled-gadget focusable-child* content>> ;
 PRIVATE>
 
 : <labeled-gadget> ( gadget title color -- labeled )
-    vertical labeled-gadget new-track with-lines
+    vertical labeled-gadget new-track
     swap >>color
     add-title-bar
     swap >>content
diff --git a/basis/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor
index 429630e573..dc8675f0c6 100644
--- a/basis/ui/gadgets/menus/menus.factor
+++ b/basis/ui/gadgets/menus/menus.factor
@@ -2,10 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators kernel locals math math.rectangles
 math.vectors memoize models namespaces opengl sequences sorting
-ui.commands ui.gadgets ui.gadgets.buttons ui.gadgets.glass
-ui.gadgets.packs ui.gadgets.worlds ui.gadgets.wrappers ui.gestures
-ui.operations ui.pens ui.pens.solid ui.theme ui.tools.common ;
-
+ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons
+ui.gadgets.glass ui.gadgets.packs ui.gadgets.worlds
+ui.gadgets.wrappers ui.gestures ui.operations ui.pens
+ui.pens.solid ui.theme ;
 FROM: ui.gadgets.wrappers => wrapper ;
 
 IN: ui.gadgets.menus
@@ -140,7 +140,7 @@ menu H{
 : <menu> ( gadgets -- menu )
     <menu-items> [
         { 0 3 } >>gap
-        margins
+        { 5 5 } <filled-border>
         menu-border-color <solid> >>boundary
         menu-background <solid> >>interior
         menu new-wrapper