From 15b075345741124d025cf05dc946b4d64e491735 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sun, 16 Aug 2015 10:41:16 -0700
Subject: [PATCH] ui.gadgets: fix some tests.

---
 basis/ui/gadgets/labeled/labeled-tests.factor     |  8 ++++++--
 basis/ui/gadgets/panes/panes-tests.factor         | 10 ----------
 basis/ui/gadgets/scrollers/scrollers-tests.factor |  2 +-
 basis/ui/gadgets/tabbed/tabbed.factor             |  1 +
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/basis/ui/gadgets/labeled/labeled-tests.factor b/basis/ui/gadgets/labeled/labeled-tests.factor
index c886dc5812..485b811545 100644
--- a/basis/ui/gadgets/labeled/labeled-tests.factor
+++ b/basis/ui/gadgets/labeled/labeled-tests.factor
@@ -1,4 +1,8 @@
+USING: accessors sequences tools.test ui.gadgets
+ui.gadgets.labeled ;
 IN: ui.gadgets.labeled.tests
-USING: ui.gadgets ui.gadgets.labeled accessors tools.test ;
 
-{ t } [ <gadget> "Hey" <labeled-gadget> content>> gadget? ] unit-test
+{ t } [
+    <gadget> "Hey" <labeled-gadget>
+    children>> first content>> gadget?
+] unit-test
diff --git a/basis/ui/gadgets/panes/panes-tests.factor b/basis/ui/gadgets/panes/panes-tests.factor
index 878f2e9180..c571e19928 100644
--- a/basis/ui/gadgets/panes/panes-tests.factor
+++ b/basis/ui/gadgets/panes/panes-tests.factor
@@ -88,16 +88,6 @@ IN: ui.gadgets.panes.tests
     ] test-gadget-text
 ] unit-test
 
-{ t } [
-    [
-        last-element off
-        \ = >link title-style get [
-            $navigation-table
-        ] with-nesting
-        "Hello world" print-content
-    ] test-gadget-text
-] unit-test
-
 { t } [
     [ { { "a\n" } } simple-table. ] test-gadget-text
 ] unit-test
diff --git a/basis/ui/gadgets/scrollers/scrollers-tests.factor b/basis/ui/gadgets/scrollers/scrollers-tests.factor
index 9f9cc213be..35df5030f3 100644
--- a/basis/ui/gadgets/scrollers/scrollers-tests.factor
+++ b/basis/ui/gadgets/scrollers/scrollers-tests.factor
@@ -41,7 +41,7 @@ IN: ui.gadgets.scrollers.tests
 { } [ "s" get layout ] unit-test
 
 "s" get [
-    [ { 31 31 } ] [ "s" get viewport>> dim>> ] unit-test
+    [ { 34 34 } ] [ "s" get viewport>> dim>> ] unit-test
 
     [ { 100 100 } ] [ "s" get viewport>> gadget-child pref-dim ] unit-test
 
diff --git a/basis/ui/gadgets/tabbed/tabbed.factor b/basis/ui/gadgets/tabbed/tabbed.factor
index b4be4ef323..71c35d0871 100644
--- a/basis/ui/gadgets/tabbed/tabbed.factor
+++ b/basis/ui/gadgets/tabbed/tabbed.factor
@@ -13,6 +13,7 @@ TUPLE: tabbed-gadget < track tabs book ;
 : <lip> ( -- gadget )
     "active-tab-lip" theme-image <icon> ;
 
+CONSTANT: button-background COLOR: FactorTan
 CONSTANT: active-tab-background COLOR: FactorDarkTan
 
 : <tab-pen> ( -- pen )