[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit e925a588efb8e0988add3cf075a34025799a65e0
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 25 22:43:05 2003 +0000

    WebKit:
    
    	- WebKit part of fix for 3141794 -- No scroll bar for the
    	"collections" column of the bookmarks window
    
            Reviewed by Darin.
    
            * WebView.subproj/WebDynamicScrollBarsView.h:
    	replaced disallowsScrolling boolean ivar with separate booleans for
    	disallowHorizontalScrolling and disallowVerticalScrolling
    
            * WebView.subproj/WebDynamicScrollBarsView.m:
            (-[WebDynamicScrollBarsView updateScrollers]):
    	take the two disallow booleans into account separately
            (-[WebDynamicScrollBarsView setAllowsHorizontalScrolling:]),
            (-[WebDynamicScrollBarsView allowsHorizontalScrolling]),
            (-[WebDynamicScrollBarsView setAllowsVerticalScrolling:]),
            (-[WebDynamicScrollBarsView allowsVerticalScrolling]):
    	new methods, do the obvious
            (-[WebDynamicScrollBarsView setAllowsScrolling:]):
    	changed to set both ivars
            (-[WebDynamicScrollBarsView allowsScrolling]):
    	changed to return YES if scrolling is allowed in either direction
    
            * WebKit.exp: exported symbol for WebDynamicScrollBarsView class name
    
    WebBrowser:
    
    	- WebBrowser part of fix for 3141794 -- No scroll bar for the
    	"collections" column of the bookmarks window
    
            Reviewed by Darin.
    
            * English.lproj/Browser.nib:
    	changed class of scroll view around collections column to
    	be WebDynamicScrollBarsView
    
            * BookmarksViewController.m:
            (-[BookmarksViewController setUpBookmarkSourcesScrollView:]):
    	new method, finds the dynamic scroll view enclosing the
    	collections column, and turns off horizontal scrolling for it.
            (-[BookmarksViewController awakeFromNib:]):
    	call setUpBookmarkSourcesScrollView
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3918 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index de06d97..c16350c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,29 @@
+2003-03-25  John Sullivan  <sullivan at apple.com>
+
+	- WebKit part of fix for 3141794 -- No scroll bar for the 
+	"collections" column of the bookmarks window
+
+        Reviewed by Darin.
+
+        * WebView.subproj/WebDynamicScrollBarsView.h:
+	replaced disallowsScrolling boolean ivar with separate booleans for
+	disallowHorizontalScrolling and disallowVerticalScrolling
+
+        * WebView.subproj/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+	take the two disallow booleans into account separately
+        (-[WebDynamicScrollBarsView setAllowsHorizontalScrolling:]),
+        (-[WebDynamicScrollBarsView allowsHorizontalScrolling]),
+        (-[WebDynamicScrollBarsView setAllowsVerticalScrolling:]),
+        (-[WebDynamicScrollBarsView allowsVerticalScrolling]):
+	new methods, do the obvious
+        (-[WebDynamicScrollBarsView setAllowsScrolling:]):
+	changed to set both ivars
+        (-[WebDynamicScrollBarsView allowsScrolling]):
+	changed to return YES if scrolling is allowed in either direction
+
+        * WebKit.exp: exported symbol for WebDynamicScrollBarsView class name
+
 2003-03-25  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Richard
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index dc2e7d4..6bf2ecd 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -5,6 +5,7 @@
 .objc_class_name_WebDefaultContextMenuDelegate
 .objc_class_name_WebDefaultPolicyDelegate
 .objc_class_name_WebDownload
+.objc_class_name_WebDynamicScrollBarsView
 .objc_class_name_WebFormDelegate
 .objc_class_name_WebFrame
 .objc_class_name_WebFrameView
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
index 09c902c..d0a5e51 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
@@ -10,16 +10,26 @@
 #import <WebCore/WebCoreScrollView.h>
 
 // FIXME 2980779: This has grown to be more than just a dynamic scroll bar view,
-// and it no longer works outside of WebKit.
+// and it is no longer completely appropriate for use outside of WebKit.
 
 @interface WebDynamicScrollBarsView : WebCoreScrollView <WebCoreFrameView>
 {
-    BOOL disallowsScrolling;
+    BOOL disallowsHorizontalScrolling;
+    BOOL disallowsVerticalScrolling;
     BOOL suppressLayout;
 }
 
+- (void)setAllowsHorizontalScrolling:(BOOL)flag;
+- (BOOL)allowsHorizontalScrolling;
+- (void)setAllowsVerticalScrolling:(BOOL)flag;
+- (BOOL)allowsVerticalScrolling;
+
+// Convenience method to affect both scrolling directions at once.
 - (void)setAllowsScrolling:(BOOL)flag;
+
+// Returns YES if either horizontal or vertical scrolling is allowed.
 - (BOOL)allowsScrolling;
+
 - (void)updateScrollers;
 - (void)setSuppressLayout: (BOOL)flag;
 @end
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 8485a7a..b2fd7fe 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -38,7 +38,7 @@
         BOOL scrollsVertically;
         BOOL scrollsHorizontally;
     
-        if (disallowsScrolling) {
+        if (![self allowsScrolling]) {
             scrollsVertically = NO;
             scrollsHorizontally = NO;
         } else {
@@ -54,13 +54,13 @@
             NSSize documentSize = [documentView frame].size;
             NSSize frameSize = [self frame].size;
             
-            scrollsVertically = documentSize.height > frameSize.height;
+            scrollsVertically = !disallowsVerticalScrolling && documentSize.height > frameSize.height;
             if (scrollsVertically)
-                scrollsHorizontally = documentSize.width + [NSScroller scrollerWidth] > frameSize.width;
+                scrollsHorizontally = !disallowsHorizontalScrolling && documentSize.width + [NSScroller scrollerWidth] > frameSize.width;
             else {
-                scrollsHorizontally = documentSize.width > frameSize.width;
+                scrollsHorizontally = !disallowsHorizontalScrolling && documentSize.width > frameSize.width;
                 if (scrollsHorizontally)
-                    scrollsVertically = documentSize.height + [NSScroller scrollerWidth] > frameSize.height;
+                    scrollsVertically = !disallowsVerticalScrolling && documentSize.height + [NSScroller scrollerWidth] > frameSize.height;
             }
         }
     
@@ -91,15 +91,38 @@
     [super reflectScrolledClipView:clipView];
 }
 
+- (void)setAllowsHorizontalScrolling:(BOOL)flag
+{
+    disallowsHorizontalScrolling = !flag;
+    [self updateScrollers];
+}
+
+- (BOOL)allowsHorizontalScrolling
+{
+    return !disallowsHorizontalScrolling;
+}
+
+- (void)setAllowsVerticalScrolling:(BOOL)flag
+{
+    disallowsVerticalScrolling = !flag;
+    [self updateScrollers];
+}
+
+- (BOOL)allowsVerticalScrolling
+{
+    return !disallowsVerticalScrolling;
+}
+
 - (void)setAllowsScrolling:(BOOL)flag
 {
-    disallowsScrolling = !flag;
+    disallowsVerticalScrolling = !flag;
+    disallowsHorizontalScrolling = !flag;
     [self updateScrollers];
 }
 
 - (BOOL)allowsScrolling
 {
-    return !disallowsScrolling;
+    return !disallowsHorizontalScrolling || !disallowsVerticalScrolling;
 }
 
 @end

-- 
WebKit Debian packaging