Fixed compatibility issue with labeled gadget

diff --git a/basis/ui/gadgets/colors/colors.factor b/basis/ui/gadgets/colors/colors.factor
index 3ae3c72e4c97420f643ab204a0bcf1de0490874d..f7428a5bdd22d8071bc9e4bd01f9996bb3ce9fdb 100644 (file)
--- a/basis/ui/gadgets/colors/colors.factor
+++ b/basis/ui/gadgets/colors/colors.factor
@@ -18,6 +18,7 @@ CONSTANT: errors-color COLOR: chocolate1
 CONSTANT: details-color COLOR: SlateGray2
 
 CONSTANT: debugger-color COLOR: chocolate1
+CONSTANT: completion-color COLOR: magenta
 
 CONSTANT: data-stack-color COLOR: DodgerBlue
 CONSTANT: retain-stack-color COLOR: HotPink

diff --git a/basis/ui/gadgets/labeled/labeled.factor b/basis/ui/gadgets/labeled/labeled.factor
index 1e0daea9b307d7bb9d8c4df4e0c7589bdcdbb059..a5ab87568c6871c64655ac5b23ad93bd6f5d23f2 100644 (file)
--- a/basis/ui/gadgets/labeled/labeled.factor
+++ b/basis/ui/gadgets/labeled/labeled.factor
@@ -37,13 +37,24 @@ M: labeled-gadget focusable-child* content>> ;
 
 PRIVATE>
 
-: <labeled-gadget> ( gadget title color -- labeled )
+: <labeled> ( gadget title color -- labeled )
     vertical labeled-gadget new-track with-lines
     swap >>color
     add-title-bar
     swap >>content
     add-content-area ;
-    
-: <framed-labeled-gadget> ( gadget title color -- labeled )
-    <labeled-gadget>
-    COLOR: grey85 <solid> >>boundary ;
+
+: <framed-labeled> ( gadget title color -- labeled )
+    <labeled> COLOR: grey85 <solid> >>boundary ;
+
+: <labeled-gadget> ( gadget title -- labeled )
+    vertical labeled-gadget new-track with-lines
+    add-title-bar
+    swap >>content dup content>>
+    vertical <track> 
+    add-content
+    { 5 5 } <border>
+    content-background <solid> >>interior
+    1 track-add
+    COLOR: grey85 <solid> >>boundary
+    { 3 3 } <border> ;

diff --git a/basis/ui/tools/browser/popups/popups.factor b/basis/ui/tools/browser/popups/popups.factor
index b49cfdaeb5eeac604316afafdc8765afb08ca988..8a65136b8a05642b82e4d30dc09a08695c2c1779 100644 (file)
--- a/basis/ui/tools/browser/popups/popups.factor
+++ b/basis/ui/tools/browser/popups/popups.factor
@@ -33,7 +33,7 @@ TUPLE: links-popup < wrapper ;
 
 : <links-popup> ( model quot title -- gadget )
     [ <links-table> COLOR: white <solid> >>interior ] dip
-    popup-color <labeled-gadget> links-popup new-wrapper ;
+    popup-color <labeled> links-popup new-wrapper ;
 
 links-popup H{
     { T{ key-down f f "ESC" } [ hide-glass ] }

diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor
index 1ed266cbc0113d250b3b3fc8f79f16dc88d2d17b..dfb00c9564686ae1517e2f8ef6a6bef2190847d6 100644 (file)
--- a/basis/ui/tools/error-list/error-list.factor
+++ b/basis/ui/tools/error-list/error-list.factor
@@ -168,11 +168,11 @@ error-display "toolbar" f {
     error-list vertical <track> with-lines
         error-list <error-list-toolbar> f track-add
         error-list source-file-table>> margins <scroller> white-interior
-        "Source files" source-files-color <labeled-gadget> 1/4 track-add
+        "Source files" source-files-color <labeled> 1/4 track-add
         error-list error-table>> margins <scroller> white-interior
-        "Errors" errors-color <labeled-gadget> 1/4 track-add
+        "Errors" errors-color <labeled> 1/4 track-add
         error-list error-display>>
-        "Details" details-color <labeled-gadget> 1/2 track-add
+        "Details" details-color <labeled> 1/2 track-add
         1 track-add ;
 
 M: error-list-gadget focusable-child*

diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor
index e04bebc2d3ed96f1c800db6a778cfc9fa27920d7..04071798ad2f1742d2dd6bc60a0c03b5a00bd2c5 100644 (file)
--- a/basis/ui/tools/inspector/inspector.factor
+++ b/basis/ui/tools/inspector/inspector.factor
@@ -86,8 +86,8 @@ M: hashtable make-slot-descriptions
         add-toolbar
         swap >>model
         dup model>> <inspector-table> >>table
-        dup model>> <summary-gadget> margins white-interior "Object" object-color <labeled-gadget> f track-add
-        dup table>> <scroller> white-interior "Contents" contents-color <labeled-gadget> 1 track-add ;
+        dup model>> <summary-gadget> margins white-interior "Object" object-color <labeled> f track-add
+        dup table>> <scroller> white-interior "Contents" contents-color <labeled> 1 track-add ;
 
 M: inspector-gadget focusable-child*
     table>> ;

diff --git a/basis/ui/tools/listener/completion/completion.factor b/basis/ui/tools/listener/completion/completion.factor
index 6543c8051a0fb35fc934dcb64c9c9a2f8f6934f4..af3615c97586a46ce98de696f763112413cd1be2 100644 (file)
--- a/basis/ui/tools/listener/completion/completion.factor
+++ b/basis/ui/tools/listener/completion/completion.factor
@@ -4,7 +4,7 @@ USING: accessors arrays assocs calendar colors colors.constants
 documents documents.elements fry kernel words sets splitting math
 math.vectors models.delay models.arrow combinators.short-circuit
 parser present sequences tools.completion help.vocabs generic fonts
-definitions.icons ui.images ui.commands ui.operations ui.gadgets
+definitions.icons ui.images ui.commands ui.operations ui.gadgets ui.gadgets.colors
 ui.gadgets.editors ui.gadgets.glass ui.gadgets.scrollers
 ui.gadgets.tables ui.gadgets.tracks ui.gadgets.labeled
 ui.gadgets.worlds ui.gadgets.wrappers ui.gestures ui.pens.solid
@@ -154,7 +154,7 @@ GENERIC# accept-completion-hook 1 ( item popup -- )
     [ vertical completion-popup new-track ] 2dip
     [ [ >>interactor ] [ >>completion-mode ] bi* ] [ <completion-table> >>table ] 2bi
     dup [ <completion-scroller> ] [ completion-mode>> completion-banner ] bi
-    COLOR: yellow <labeled-gadget> 1 track-add ;
+    completion-color <framed-labeled> 1 track-add ;
 
 completion-popup H{
     { T{ key-down f f "TAB" } [ table>> row-action ] }

diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index b8ff7bec2ea5b2c7a3d8ec3965046232c01dabf9..3a82da5e934a4c20f5f0f34459c0e0ff3fbc80f8 100644 (file)
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -335,7 +335,7 @@ M: object accept-completion-hook 2drop ;
 
 : <debugger-popup> ( error continuation -- popup )
     over compute-restarts [ hide-glass ] <debugger> 
-    "Error" debugger-color <framed-labeled-gadget> ;
+    "Error" debugger-color <framed-labeled> ;
 
 : debugger-popup ( interactor error continuation -- )
     [ one-line-elt ] 2dip <debugger-popup> show-listener-popup ;

diff --git a/basis/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor
index 25149c5d85e70163785a2c00ca866f9f12255872..0b2b2820f742663ff6c38575d565ad007c1d06f5 100644 (file)
--- a/basis/ui/tools/traceback/traceback.factor
+++ b/basis/ui/tools/traceback/traceback.factor
@@ -33,12 +33,12 @@ M: stack-entry-renderer row-value drop object>> ;
 
 : <stack-display> ( model quot title color -- gadget )
     [ '[ dup _ when ] <arrow> <stack-table> margins <scroller> white-interior ] 2dip
-    <labeled-gadget> ; ! Il attend le titre en dernier
+    <labeled> ;
 
 : <callstack-display> ( model -- gadget )
     [ [ call>> callstack. ] when* ]
     <pane-control> t >>scrolls? margins <scroller> white-interior
-    "Call stack" call-stack-color <labeled-gadget> ;
+    "Call stack" call-stack-color <labeled> ;
 
 : <datastack-display> ( model -- gadget )
     [ data>> ] "Data stack" data-stack-color <stack-display> ;