ui: use control-value/set-control-value in a few places.
parent
9b6133d081
commit
f6af1da32f
|
@ -257,19 +257,19 @@ PRIVATE>
|
|||
bi ;
|
||||
|
||||
: update-mouse-index ( table -- )
|
||||
dup [ model>> value>> ] [ mouse-index>> ] bi
|
||||
dup [ control-value ] [ mouse-index>> ] bi
|
||||
dup [ swap length [ drop f ] [ 1 - min ] if-zero ] [ 2drop f ] if
|
||||
>>mouse-index drop ;
|
||||
|
||||
: initial-selection-index ( table -- n/f )
|
||||
{
|
||||
[ model>> value>> empty? not ]
|
||||
[ control-value empty? not ]
|
||||
[ selection-required?>> ]
|
||||
[ drop 0 ]
|
||||
} 1&& ;
|
||||
|
||||
: find-row-index ( value table -- n/f )
|
||||
[ model>> value>> ] [ renderer>> ] bi
|
||||
[ control-value ] [ renderer>> ] bi
|
||||
'[ _ row-value? ] with find drop ;
|
||||
|
||||
: update-table-rows ( table -- )
|
||||
|
|
|
@ -28,10 +28,10 @@ M: browser-gadget set-history-value
|
|||
: show-help ( link browser-gadget -- )
|
||||
[ >link ] dip
|
||||
[
|
||||
2dup model>> value>> =
|
||||
2dup control-value =
|
||||
[ 2drop ] [ [ add-recent ] [ history>> add-history ] bi* ] if
|
||||
]
|
||||
[ model>> set-model ]
|
||||
[ set-control-value ]
|
||||
2bi ;
|
||||
|
||||
: <help-pane> ( browser-gadget -- gadget )
|
||||
|
@ -84,7 +84,7 @@ M: browser-gadget handle-gesture
|
|||
} 2|| ;
|
||||
|
||||
M: browser-gadget definitions-changed ( set browser -- )
|
||||
[ model>> value>> swap showing-definition? ] keep
|
||||
[ control-value swap showing-definition? ] keep
|
||||
'[ _ [ history-value ] keep set-history-value ] when ;
|
||||
|
||||
M: browser-gadget focusable-child* search-field>> ;
|
||||
|
|
|
@ -133,13 +133,13 @@ TUPLE: error-display < track ;
|
|||
dup model>> [ [ print-error ] when* ] <pane-control> <scroller> 1 track-add ;
|
||||
|
||||
: com-inspect ( error-display -- )
|
||||
model>> value>> [ inspector ] when* ;
|
||||
control-value [ inspector ] when* ;
|
||||
|
||||
: com-help ( error-display -- )
|
||||
model>> value>> [ error>> error-help-window ] when* ;
|
||||
control-value [ error>> error-help-window ] when* ;
|
||||
|
||||
: com-edit ( error-display -- )
|
||||
model>> value>> [ edit-error ] when* ;
|
||||
control-value [ edit-error ] when* ;
|
||||
|
||||
error-display "toolbar" f {
|
||||
{ f com-inspect }
|
||||
|
|
|
@ -144,7 +144,7 @@ TUPLE: gml-viewer-world < wasd-world
|
|||
drag? ;
|
||||
|
||||
TYPED: refresh-b-rep-view ( world: gml-viewer-world -- )
|
||||
dup model>> value>> >>b-rep
|
||||
dup control-value >>b-rep
|
||||
dup vertex-array>> [ vertex-array-buffer dispose ] when*
|
||||
dup [ b-rep>> ] [ selected>> value>> ] bi make-b-rep-vertices {
|
||||
[
|
||||
|
@ -162,7 +162,7 @@ TYPED: refresh-b-rep-view ( world: gml-viewer-world -- )
|
|||
|
||||
M: gml-viewer-world model-changed
|
||||
nip
|
||||
[ model>> value>> ]
|
||||
[ control-value ]
|
||||
[ b-rep<< ]
|
||||
[ dup viewable? [ refresh-b-rep-view ] [ drop ] if ] tri ;
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ TUPLE: slides < book ;
|
|||
|
||||
: change-page ( book n -- )
|
||||
over control-value + over children>> length rem
|
||||
swap model>> set-model ;
|
||||
swap set-control-value ;
|
||||
|
||||
: next-page ( book -- ) 1 change-page ;
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ IN: ui.gadgets.book-extras
|
|||
: <book-border-btn> ( label quot -- button ) (book-t) <border-button> ;
|
||||
: >>> ( gadget -- ) owner next ;
|
||||
: <<< ( gadget -- ) owner prev ;
|
||||
: go-to ( gadget number -- ) swap owner model>> set-model ;
|
||||
: go-to ( gadget number -- ) swap owner set-control-value ;
|
||||
|
||||
: <forward-btn> ( label -- button ) [ >>> ] <button> ;
|
||||
: <backward-btn> ( label -- button ) [ <<< ] <button> ;
|
||||
|
|
|
@ -71,7 +71,7 @@ M: window3D draw-gadget* ( gadget -- )
|
|||
GL_FRONT GL_AMBIENT_AND_DIFFUSE glColorMaterial
|
||||
! *************************
|
||||
|
||||
model>> value>>
|
||||
control-value
|
||||
[ space->GL ] when*
|
||||
|
||||
! *************************
|
||||
|
|
Loading…
Reference in New Issue