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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit fed4fd11ce4dff4d0f0fa8b303b4840136ca3a13
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 13 22:38:56 2001 +0000

    Fixed daffy window resize problems.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index c577b04..5a9eb99 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -56,19 +56,27 @@ QWidget* QScrollView::viewport() const
 
 int QScrollView::visibleWidth() const
 {
-    // ? Is this used to determined what is rendered
-    // by the engine.
-    NSRect bounds = [getView() bounds];
-    return (int)bounds.size.width;
+    NSScrollView *scrollView = [[getView() superview] superview];
+    int visibleWidth;
+    
+    if (scrollView != nil && [scrollView isKindOfClass: [NSScrollView class]])
+        visibleWidth = (int)([scrollView documentVisibleRect].size.width);
+    else
+        visibleWidth = (int)([getView() bounds].size.width);
+    return visibleWidth;
 }
 
 
 int QScrollView::visibleHeight() const
 {
-    // ? Is this used to determined what is rendered
-    // by the engine.
-    NSRect bounds = [getView() bounds];
-    return (int)bounds.size.height;
+    NSScrollView *scrollView = [[getView() superview] superview];
+    int visibleHeight;
+    
+    if (scrollView != nil && [scrollView isKindOfClass: [NSScrollView class]])
+        visibleHeight = (int)([scrollView documentVisibleRect].size.height);
+    else
+        visibleHeight = (int)([getView() bounds].size.height);
+    return visibleHeight;
 }
 
 
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index c577b04..5a9eb99 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -56,19 +56,27 @@ QWidget* QScrollView::viewport() const
 
 int QScrollView::visibleWidth() const
 {
-    // ? Is this used to determined what is rendered
-    // by the engine.
-    NSRect bounds = [getView() bounds];
-    return (int)bounds.size.width;
+    NSScrollView *scrollView = [[getView() superview] superview];
+    int visibleWidth;
+    
+    if (scrollView != nil && [scrollView isKindOfClass: [NSScrollView class]])
+        visibleWidth = (int)([scrollView documentVisibleRect].size.width);
+    else
+        visibleWidth = (int)([getView() bounds].size.width);
+    return visibleWidth;
 }
 
 
 int QScrollView::visibleHeight() const
 {
-    // ? Is this used to determined what is rendered
-    // by the engine.
-    NSRect bounds = [getView() bounds];
-    return (int)bounds.size.height;
+    NSScrollView *scrollView = [[getView() superview] superview];
+    int visibleHeight;
+    
+    if (scrollView != nil && [scrollView isKindOfClass: [NSScrollView class]])
+        visibleHeight = (int)([scrollView documentVisibleRect].size.height);
+    else
+        visibleHeight = (int)([getView() bounds].size.height);
+    return visibleHeight;
 }
 
 

-- 
WebKit Debian packaging