steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix scroll>rect for recent scroller layout change

db4
Slava Pestov 2009-01-29 16:44:18 -06:00
parent f84ed37648
commit fc360f5ced
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/ui/gadgets/scrollers/scrollers.factor
View File

@ -1,4 +1,4 @@
! Copyright (C) 2005, 2008 Slava Pestov. ! Copyright (C) 2005, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays ui.gadgets ui.gadgets.viewports USING: accessors arrays ui.gadgets ui.gadgets.viewports
ui.gadgets.frames ui.gadgets.grids ui.gadgets.theme ui.gadgets.frames ui.gadgets.grids ui.gadgets.theme
@ -59,7 +59,7 @@ scroller H{
[ [ loc>> ] [ dim>> ] bi ] dip vmin <rect> ; [ [ loc>> ] [ dim>> ] bi ] dip vmin <rect> ;
: (scroll>rect) ( rect scroller -- ) : (scroll>rect) ( rect scroller -- )
[ [ loc>> { 1 1 } v- ] [ dim>> { 1 1 } v+ ] bi <rect> ] dip [ [ loc>> ] [ dim>> { 1 1 } v+ ] bi <rect> ] dip
{ {
[ scroller-value vneg offset-rect viewport-gap offset-rect ] [ scroller-value vneg offset-rect viewport-gap offset-rect ]
[ viewport>> dim>> rect-min ] [ viewport>> dim>> rect-min ]
@ -88,7 +88,7 @@ scroller H{
: (scroll>gadget) ( gadget scroller -- ) : (scroll>gadget) ( gadget scroller -- )
2dup swap child? [ 2dup swap child? [
[ [ pref-dim { 0 0 } swap <rect> ] keep ] dip [ [ [ { 0 0 } ] dip pref-dim <rect> ] keep ] dip
[ relative-scroll-rect ] keep [ relative-scroll-rect ] keep
(scroll>rect) (scroll>rect)
] [ f >>follows (update-scroller) drop ] if ; ] [ f >>follows (update-scroller) drop ] if ;