ui.gadgets.tabbed: re-add internal border

diff --git a/basis/ui/gadgets/tabbed/tabbed.factor b/basis/ui/gadgets/tabbed/tabbed.factor
index 7e7d0eac088a4cb2c9fd4378efadf4a4b3e1d1e6..0872c1783d573fb35fa855bbe3f599530cb3f0c3 100644 (file)
--- a/basis/ui/gadgets/tabbed/tabbed.factor
+++ b/basis/ui/gadgets/tabbed/tabbed.factor
@@ -31,8 +31,8 @@ PRIVATE>
         horizontal <track>
             over tabs>> 1 track-add
         f track-add
-        dup model>> <empty-book> white-interior >>book
-        dup book>> 1 track-add ;
+        dup model>> <empty-book> >>book
+        dup book>> { 5 5 } <filled-border> white-interior 1 track-add ;
 
 : add-tab ( tabbed child label -- tabbed )
     [ add-tab/book ] [ add-tab/button ] bi* ;

diff --git a/extra/color-picker-game/color-picker-game.factor b/extra/color-picker-game/color-picker-game.factor
index 3c65fe851d278ef2774f5972d7eb269f352fa0f0..ea8874b1f872292e9d888071a23c7e9a84475f29 100644 (file)
--- a/extra/color-picker-game/color-picker-game.factor
+++ b/extra/color-picker-game/color-picker-game.factor
@@ -50,4 +50,4 @@ TUPLE: color-picker-game < track ;
 
 MAIN-WINDOW: color-picker-game-window
     { { title "Color Picker Game" } }
-    <color-picker-games> { 5 5 } <border> >>gadgets ;
+    <color-picker-games> >>gadgets ;

diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index aac97b647738de598d1413b2da23cfb4788687dd..a5f6318558ebcb1004fa9e17a79827577ab6b9b2 100644 (file)
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -81,5 +81,6 @@ M: color-preview model-changed
 : <color-pickers> ( -- gadget )
     [ <color-picker> ] <color-tabs> ;
 
-MAIN-WINDOW: color-picker-window { { title "Color Picker" } }
-    <color-pickers> { 5 5 } <border> white-interior >>gadgets ;
+MAIN-WINDOW: color-picker-window
+    { { title "Color Picker" } }
+    <color-pickers> >>gadgets ;