Merge commit 'factor/master'
commit
fe58c8c3f7
|
@ -28,7 +28,7 @@ IN: ui.gadgets.scrollers.tests
|
||||||
"v" get [
|
"v" get [
|
||||||
[ { 10 20 } ] [ "v" get model>> range-value ] unit-test
|
[ { 10 20 } ] [ "v" get model>> range-value ] unit-test
|
||||||
|
|
||||||
[ { 10 20 } ] [ "g" get rect-loc vneg { 3 3 } v+ ] unit-test
|
[ { 10 20 } ] [ "g" get rect-loc vneg viewport-gap v+ scroller-border v+ ] unit-test
|
||||||
] with-grafted-gadget
|
] with-grafted-gadget
|
||||||
|
|
||||||
[ ] [
|
[ ] [
|
||||||
|
@ -43,13 +43,13 @@ IN: ui.gadgets.scrollers.tests
|
||||||
"s" get [
|
"s" get [
|
||||||
[ { 34 34 } ] [ "s" get viewport>> rect-dim ] unit-test
|
[ { 34 34 } ] [ "s" get viewport>> rect-dim ] unit-test
|
||||||
|
|
||||||
[ { 106 106 } ] [ "s" get viewport>> viewport-dim ] unit-test
|
[ { 107 107 } ] [ "s" get viewport>> viewport-dim ] unit-test
|
||||||
|
|
||||||
[ ] [ { 0 0 } "s" get scroll ] unit-test
|
[ ] [ { 0 0 } "s" get scroll ] unit-test
|
||||||
|
|
||||||
[ { 0 0 } ] [ "s" get model>> range-min-value ] unit-test
|
[ { 0 0 } ] [ "s" get model>> range-min-value ] unit-test
|
||||||
|
|
||||||
[ { 106 106 } ] [ "s" get model>> range-max-value ] unit-test
|
[ { 107 107 } ] [ "s" get model>> range-max-value ] unit-test
|
||||||
|
|
||||||
[ ] [ { 10 20 } "s" get scroll ] unit-test
|
[ ] [ { 10 20 } "s" get scroll ] unit-test
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ IN: ui.gadgets.scrollers.tests
|
||||||
|
|
||||||
[ { 10 20 } ] [ "s" get viewport>> model>> range-value ] unit-test
|
[ { 10 20 } ] [ "s" get viewport>> model>> range-value ] unit-test
|
||||||
|
|
||||||
[ { 10 20 } ] [ "g" get rect-loc vneg { 3 3 } v+ ] unit-test
|
[ { 10 20 } ] [ "g" get rect-loc vneg viewport-gap v+ scroller-border v+ ] unit-test
|
||||||
] with-grafted-gadget
|
] with-grafted-gadget
|
||||||
|
|
||||||
<gadget> { 600 400 } >>dim "g1" set
|
<gadget> { 600 400 } >>dim "g1" set
|
||||||
|
@ -102,7 +102,7 @@ dup layout
|
||||||
swap dup quot>> call
|
swap dup quot>> call
|
||||||
dup layout
|
dup layout
|
||||||
model>> dependencies>> [ range-max value>> ] map
|
model>> dependencies>> [ range-max value>> ] map
|
||||||
viewport-gap 2 v*n =
|
viewport-padding =
|
||||||
] unit-test
|
] unit-test
|
||||||
|
|
||||||
\ <scroller> must-infer
|
\ <scroller> must-infer
|
||||||
|
|
|
@ -3,7 +3,7 @@ strings math regexp regexp.backend ;
|
||||||
IN: validators
|
IN: validators
|
||||||
|
|
||||||
HELP: v-checkbox
|
HELP: v-checkbox
|
||||||
{ $values { "str" string } }
|
{ $values { "str" string } { "?" "a boolean" } }
|
||||||
{ $description "Converts the string value of a checkbox component (either \"on\" or \"off\") to a boolean value." } ;
|
{ $description "Converts the string value of a checkbox component (either \"on\" or \"off\") to a boolean value." } ;
|
||||||
|
|
||||||
HELP: v-captcha
|
HELP: v-captcha
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
! See http://factorcode.org/license.txt for BSD license.
|
! See http://factorcode.org/license.txt for BSD license.
|
||||||
USING: kernel continuations sequences math namespaces make sets
|
USING: kernel continuations sequences math namespaces make sets
|
||||||
math.parser math.ranges assocs regexp unicode.categories arrays
|
math.parser math.ranges assocs regexp unicode.categories arrays
|
||||||
hashtables words classes quotations xmode.catalog ;
|
hashtables words classes quotations xmode.catalog unicode.case ;
|
||||||
IN: validators
|
IN: validators
|
||||||
|
|
||||||
: v-checkbox ( str -- ? )
|
: v-checkbox ( str -- ? )
|
||||||
"on" = ;
|
>lower "on" = ;
|
||||||
|
|
||||||
: v-default ( str def -- str/def )
|
: v-default ( str def -- str/def )
|
||||||
over empty? spin ? ;
|
over empty? spin ? ;
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
unportable
|
Loading…
Reference in New Issue