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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 5e10a7c6e034fcb3bf5bb53367ffc94edaf72bcb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 14 19:37:49 2002 +0000

    	- fixed 3095854 -- small select boxes get no scrollbar
    
            * kwq/KWQListBox.mm: (QListBox::sizeForNumberOfLines):
    	Always use a minimum of 4 lines.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5be2e6e..884dd58 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3095854 -- small select boxes get no scrollbar
+
+        * kwq/KWQListBox.mm: (QListBox::sizeForNumberOfLines):
+	Always use a minimum of 4 lines.
+
 === Alexander-32 ===
 
 2002-11-14  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5be2e6e..884dd58 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3095854 -- small select boxes get no scrollbar
+
+        * kwq/KWQListBox.mm: (QListBox::sizeForNumberOfLines):
+	Always use a minimum of 4 lines.
+
 === Alexander-32 ===
 
 2002-11-14  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5be2e6e..884dd58 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3095854 -- small select boxes get no scrollbar
+
+        * kwq/KWQListBox.mm: (QListBox::sizeForNumberOfLines):
+	Always use a minimum of 4 lines.
+
 === Alexander-32 ===
 
 2002-11-14  Darin Adler  <darin at apple.com>
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index bd3c8f4..47efe51 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -27,6 +27,8 @@
 
 #import "KWQAssertions.h"
 
+#define MIN_LINES 4 /* ensures we have a scroll bar */
+
 @interface KWQListBoxScrollView : NSScrollView
 {
 }
@@ -196,7 +198,7 @@ QSize QListBox::sizeForNumberOfLines(int lines) const
     
     NSSize contentSize;
     contentSize.width = ceil(width);
-    contentSize.height = ceil(([tableView rowHeight] + [tableView intercellSpacing].height) * lines);
+    contentSize.height = ceil(([tableView rowHeight] + [tableView intercellSpacing].height) * MAX(MIN_LINES, lines));
     NSSize size = [NSScrollView frameSizeForContentSize:contentSize
         hasHorizontalScroller:NO hasVerticalScroller:YES borderType:NSBezelBorder];
 

-- 
WebKit Debian packaging