[graphic-forms-cvs] r270 - trunk/src/uitoolkit/widgets

[junrue at common-lisp.net]

Author: junrue
Date: Tue Sep 26 18:12:23 2006
New Revision: 270

Modified:
   trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp
Log:
update viewport size after calculating vertical scrollbar page size so that horizontal scrollbar page size takes the vertical scrollbar into account

Modified: trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp
==============================================================================
--- trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp	(original)
+++ trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp	Tue Sep 26 18:12:23 2006
@@ -102,14 +102,15 @@
         (top (obtain-top-child window)))
     (let ((step-incs (step-increments disp))
           (top-size (if top (size top) viewport-size)))
-      (update-scrollbar-page-size (obtain-horizontal-scrollbar window)
-                                  (gfs:size-width viewport-size)
-                                  (gfs:size-width top-size)
-                                  (gfs:size-width step-incs))
       (update-scrollbar-page-size (obtain-vertical-scrollbar window)
                                   (gfs:size-height viewport-size)
                                   (gfs:size-height top-size)
-                                  (gfs:size-height step-incs)))))
+                                  (gfs:size-height step-incs))
+      (setf viewport-size (client-size window))
+      (update-scrollbar-page-size (obtain-horizontal-scrollbar window)
+                                  (gfs:size-width viewport-size)
+                                  (gfs:size-width top-size)
+                                  (gfs:size-width step-incs)))))
 
 (defun update-viewport-origin-for-resize (window)
   (let* ((top (obtain-top-child window))
@@ -124,7 +125,6 @@
     (if (and (> delta-y 0) (> (gfs:point-y origin) 0))
       (setf (gfs:point-y origin) (max 0 (- (gfs:point-y origin) delta-y)))
       (setf delta-y 0))
-(format t "~a~%" origin)
     (scroll top delta-x delta-y nil 0)
     origin))