Fixing stuff, made browser commands spawn new windows
parent
a69dde27e4
commit
ff1d24d25e
|
@ -33,7 +33,7 @@ H{ } clone views set-global
|
||||||
r> [frame] NSRect-h swap - 0 3array ;
|
r> [frame] NSRect-h swap - 0 3array ;
|
||||||
|
|
||||||
: send-mouse-moved ( view event -- )
|
: send-mouse-moved ( view event -- )
|
||||||
swap [ mouse-location ] keep view move-hand ;
|
over >r mouse-location r> view move-hand ;
|
||||||
|
|
||||||
: button ( event -- n )
|
: button ( event -- n )
|
||||||
#! Cocoa -> Factor UI button mapping
|
#! Cocoa -> Factor UI button mapping
|
||||||
|
|
|
@ -84,7 +84,7 @@ C: hand ( -- hand )
|
||||||
|
|
||||||
: show-message ( string/f -- )
|
: show-message ( string/f -- )
|
||||||
#! Show a message in the status bar.
|
#! Show a message in the status bar.
|
||||||
world-status set-label-text* ;
|
world-status [ set-label-text* ] [ drop ] if* ;
|
||||||
|
|
||||||
: update-help ( -- string )
|
: update-help ( -- string )
|
||||||
#! Update mouse-over help message.
|
#! Update mouse-over help message.
|
||||||
|
|
|
@ -13,8 +13,5 @@ gadgets-listener io kernel memory namespaces sequences ;
|
||||||
{ "Exit" [ 0 exit ] }
|
{ "Exit" [ 0 exit ] }
|
||||||
} <launchpad> ;
|
} <launchpad> ;
|
||||||
|
|
||||||
: simple-window ( gadget title -- )
|
|
||||||
>r "" <label> over pref-dim r> in-window ;
|
|
||||||
|
|
||||||
: launchpad-window ( -- )
|
: launchpad-window ( -- )
|
||||||
default-launchpad "Factor" simple-window ;
|
default-launchpad "Factor" simple-window ;
|
||||||
|
|
|
@ -9,17 +9,12 @@ namespaces parser prettyprint sequences shells threads words
|
||||||
help ;
|
help ;
|
||||||
|
|
||||||
SYMBOL: stack-bar
|
SYMBOL: stack-bar
|
||||||
SYMBOL: browser-pane
|
|
||||||
|
|
||||||
: reveal-in-split ( gadget n -- )
|
|
||||||
>r find-splitter dup splitter-split r> - abs 1/16 <
|
|
||||||
[ 1/3 over set-splitter-split dup relayout ] when drop ;
|
|
||||||
|
|
||||||
: in-browser ( quot -- )
|
: in-browser ( quot -- )
|
||||||
browser-pane get dup 0 reveal-in-split swap with-pane ; inline
|
make-pane <scroller> "Browser" simple-window ; inline
|
||||||
|
|
||||||
: in-listener ( quot -- )
|
: in-listener ( quot -- )
|
||||||
pane get dup 1 reveal-in-split pane-call ; inline
|
pane get pane-call ; inline
|
||||||
|
|
||||||
: usable-words ( -- words )
|
: usable-words ( -- words )
|
||||||
use get hash-concat hash-values ;
|
use get hash-concat hash-values ;
|
||||||
|
@ -60,16 +55,13 @@ SYMBOL: browser-pane
|
||||||
2array make-pile 1 over set-pack-fill
|
2array make-pile 1 over set-pack-fill
|
||||||
] keep ;
|
] keep ;
|
||||||
|
|
||||||
: <browser-scroller> ( -- gadget )
|
: <scroller> ( -- gadget )
|
||||||
<pane> dup browser-pane set-global <scroller> ;
|
|
||||||
|
|
||||||
: <listener-scroller> ( -- gadget )
|
|
||||||
<input-pane> dup pane set-global <scroller> ;
|
<input-pane> dup pane set-global <scroller> ;
|
||||||
|
|
||||||
: <listener> ( -- gadget status )
|
: <listener> ( -- gadget status )
|
||||||
<frame> dup solid-interior
|
<frame> dup solid-interior
|
||||||
<browser-scroller> <listener-scroller>
|
<input-pane> dup pane set-global <scroller>
|
||||||
0 <x-splitter> over @center frame-add
|
over @center frame-add
|
||||||
<bottom-bar> >r over @bottom frame-add r> ;
|
<bottom-bar> >r over @bottom frame-add r> ;
|
||||||
|
|
||||||
: listener-window ( -- )
|
: listener-window ( -- )
|
||||||
|
|
|
@ -50,3 +50,6 @@ M: world find-world ;
|
||||||
|
|
||||||
: focused-ancestors ( world -- seq )
|
: focused-ancestors ( world -- seq )
|
||||||
world-focus parents reverse-slice ;
|
world-focus parents reverse-slice ;
|
||||||
|
|
||||||
|
: simple-window ( gadget title -- )
|
||||||
|
>r f over pref-dim r> in-window ;
|
||||||
|
|
Loading…
Reference in New Issue