From 38447c276ac12ee2a3d6ce4912fb6a8fae32c738 Mon Sep 17 00:00:00 2001
From: nicolas-p <z.nicolas@gmail.com>
Date: Mon, 20 Jul 2015 17:55:54 +0200
Subject: [PATCH] Restoring the "add-" prefix
---
basis/ui/tools/browser/browser.factor | 12 ++++++------
basis/ui/tools/listener/listener.factor | 8 +++++---
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index 05ac20f14a..fb32fd0fa4 100644
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -39,7 +39,7 @@ M: browser-gadget set-history-value
CONSTANT: help-header-background COLOR: FactorLightTan
-: help-header ( track -- track )
+: add-help-header ( track -- track )
dup <help-header> { 3 3 } <border>
help-header-background <solid> >>interior
{ 1 0 } >>fill f track-add ;
@@ -47,7 +47,7 @@ CONSTANT: help-header-background COLOR: FactorLightTan
: <help-pane> ( browser-gadget -- gadget )
model>> [ '[ _ print-topic ] try ] <pane-control> ;
-: help-pane ( track -- track )
+: add-help-pane ( track -- track )
dup dup <help-pane> margins
<scroller> >>scroller scroller>> white-interior 1 track-add ;
@@ -68,7 +68,7 @@ CONSTANT: help-header-background COLOR: FactorLightTan
over <toolbar> f track-add
swap search-field>> " Search" label-on-left 1 track-add ;
-: browser-toolbar ( track -- track )
+: add-browser-toolbar ( track -- track )
dup <browser-toolbar> { 3 3 } <border>
toolbar-background <solid> >>interior { 1 0 } >>fill
f track-add ;
@@ -79,9 +79,9 @@ CONSTANT: help-header-background COLOR: FactorLightTan
swap >link <model> >>model
dup <history> >>history
dup <search-field> >>search-field
- browser-toolbar
- help-header
- help-pane ;
+ add-browser-toolbar
+ add-help-header
+ add-help-pane ;
M: browser-gadget graft*
[ add-definition-observer ] [ call-next-method ] bi ;
diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index 41adfffff9..85b83edd96 100644
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -218,13 +218,15 @@ TUPLE: listener-gadget < tool error-summary output scroller input ;
<error-summary> >>error-summary
dup error-summary>> f track-add ;
-: listener-area ( listener -- listener )
+: add-listener-area ( listener -- listener )
dup output>> margins <scroller> >>scroller
dup scroller>> white-interior 1 track-add ;
: <listener-gadget> ( -- listener )
- vertical listener-gadget new-track
- with-lines add-toolbar init-input/output listener-area
+ vertical listener-gadget new-track with-lines
+ add-toolbar
+ init-input/output
+ add-listener-area
init-error-summary ;
M: listener-gadget focusable-child*