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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 9c559c576846766892024ca822c05ff3e3a9a360
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 20:16:44 2002 +0000

    	Make checkboxes and radio buttons use the small control
    	size.  Tweak their baselines to not use font metrics and
    	to line up properly.  (voodooextreme.com nearly renders
    	the left column correctly now.)
    
            * khtml/rendering/render_form.cpp:
            (RenderCheckBox::baselinePosition):
            (RenderRadioButton::baselinePosition):
            * khtml/rendering/render_form.h:
            * kwq/KWQCheckBox.mm:
            (QCheckBox::QCheckBox):
            * kwq/KWQRadioButton.mm:
            (QRadioButton::QRadioButton):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1753 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b16b156..95d83c5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-08-06  David Hyatt  <hyatt at apple.com>
+
+	Make checkboxes and radio buttons use the small control
+	size.  Tweak their baselines to not use font metrics and
+	to line up properly.  (voodooextreme.com nearly renders
+	the left column correctly now.)
+	
+        * khtml/rendering/render_form.cpp:
+        (RenderCheckBox::baselinePosition):
+        (RenderRadioButton::baselinePosition):
+        * khtml/rendering/render_form.h:
+        * kwq/KWQCheckBox.mm:
+        (QCheckBox::QCheckBox):
+        * kwq/KWQRadioButton.mm:
+        (QRadioButton::QRadioButton):
+
 2002-08-06  John Sullivan  <sullivan at apple.com>
 
 	WebCore part of fix for 2915396 -- implement larger/smaller font
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b16b156..95d83c5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-08-06  David Hyatt  <hyatt at apple.com>
+
+	Make checkboxes and radio buttons use the small control
+	size.  Tweak their baselines to not use font metrics and
+	to line up properly.  (voodooextreme.com nearly renders
+	the left column correctly now.)
+	
+        * khtml/rendering/render_form.cpp:
+        (RenderCheckBox::baselinePosition):
+        (RenderRadioButton::baselinePosition):
+        * khtml/rendering/render_form.h:
+        * kwq/KWQCheckBox.mm:
+        (QCheckBox::QCheckBox):
+        * kwq/KWQRadioButton.mm:
+        (QRadioButton::QRadioButton):
+
 2002-08-06  John Sullivan  <sullivan at apple.com>
 
 	WebCore part of fix for 2915396 -- implement larger/smaller font
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b16b156..95d83c5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-08-06  David Hyatt  <hyatt at apple.com>
+
+	Make checkboxes and radio buttons use the small control
+	size.  Tweak their baselines to not use font metrics and
+	to line up properly.  (voodooextreme.com nearly renders
+	the left column correctly now.)
+	
+        * khtml/rendering/render_form.cpp:
+        (RenderCheckBox::baselinePosition):
+        (RenderRadioButton::baselinePosition):
+        * khtml/rendering/render_form.h:
+        * kwq/KWQCheckBox.mm:
+        (QCheckBox::QCheckBox):
+        * kwq/KWQRadioButton.mm:
+        (QRadioButton::QRadioButton):
+
 2002-08-06  John Sullivan  <sullivan at apple.com>
 
 	WebCore part of fix for 2915396 -- implement larger/smaller font
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index d5fdff9..9beadb6 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -227,6 +227,13 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
     connect(b, SIGNAL(clicked()), this, SLOT(slotClicked()));
 }
 
+#ifdef APPLE_CHANGES
+// Override to deal with our widget.
+short RenderCheckBox::baselinePosition( bool f ) const
+{
+    return RenderWidget::baselinePosition( f ) - 9;
+}
+#endif
 
 void RenderCheckBox::calcMinMaxWidth()
 {
@@ -277,6 +284,14 @@ RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element)
     connect(b, SIGNAL(clicked()), this, SLOT(slotClicked()));
 }
 
+#ifdef APPLE_CHANGES
+// Override to deal with our widget.
+short RenderRadioButton::baselinePosition( bool f ) const
+{
+    return RenderWidget::baselinePosition( f ) - 10;
+}
+#endif
+
 void RenderRadioButton::updateFromElement()
 {
     widget()->setChecked(element()->checked());
diff --git a/WebCore/khtml/rendering/render_form.h b/WebCore/khtml/rendering/render_form.h
index 6468f27..b4f0d4c 100644
--- a/WebCore/khtml/rendering/render_form.h
+++ b/WebCore/khtml/rendering/render_form.h
@@ -142,6 +142,7 @@ public:
     QCheckBox *widget() const { return static_cast<QCheckBox*>(m_widget); }
 #ifdef APPLE_CHANGES
     void performAction(QObject::Actions action);
+    short baselinePosition( bool f ) const;
 #endif /* APPLE_CHANGES */
 
 public slots:
@@ -161,6 +162,10 @@ public:
     virtual void calcMinMaxWidth();
     virtual void updateFromElement();
 
+#ifdef APPLE_CHANGES
+    short baselinePosition( bool f ) const;
+#endif
+
     QRadioButton *widget() const { return static_cast<QRadioButton*>(m_widget); }
 
 public slots:
diff --git a/WebCore/kwq/KWQCheckBox.mm b/WebCore/kwq/KWQCheckBox.mm
index dba4e5e..1e9453a 100644
--- a/WebCore/kwq/KWQCheckBox.mm
+++ b/WebCore/kwq/KWQCheckBox.mm
@@ -37,6 +37,9 @@ QCheckBox::QCheckBox(QWidget *w) : QButton (w)
     [button setButtonType: NSSwitchButton];
     [button setAction: @selector(stateChanged:)];
     setView (button);
+    
+    // Use the small control size.
+    [[button cell] setControlSize: NSSmallControlSize];
 }
 
 
diff --git a/WebCore/kwq/KWQRadioButton.mm b/WebCore/kwq/KWQRadioButton.mm
index dacfe27..b79b61d 100644
--- a/WebCore/kwq/KWQRadioButton.mm
+++ b/WebCore/kwq/KWQRadioButton.mm
@@ -31,6 +31,10 @@ QRadioButton::QRadioButton(QWidget *w) : QButton(w)
 {
     KWQNSButton *button = (KWQNSButton *)getView();
     [button setButtonType: NSRadioButton];
+    
+    // Use the small control size.
+    [[button cell] setControlSize: NSSmallControlSize];
+    
     [button sizeToFit];
 }
 

-- 
WebKit Debian packaging