[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:45:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a49ddef99a8a9cf9062a8699f1d1ca877aa70951
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 27 21:34:35 2002 +0000
- fixed 2937198 -- Checkboxes and radiobuttons don't align with title control in forms
* kwq/qt/qcheckbox.h: Add baselinePosition override.
* kwq/KWQCheckBox.mm: Tweak the size constants.
(QCheckBox::baselinePosition): Implement this. Line up baseline two pixels
above the bottom, not at the bottom.
* kwq/qt/qradiobutton.h: Add baselinePosition override.
* kwq/KWQRadioButton.mm: Tweak the size constants.
(QRadioButton::baselinePosition): Implement this. Line up baseline two pixels
above the bottom, not at the bottom.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2191 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 700096f..3d07ae5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-09-27 Darin Adler <darin at apple.com>
+
+ - fixed 2937198 -- Checkboxes and radiobuttons don't align with title control in forms
+
+ * kwq/qt/qcheckbox.h: Add baselinePosition override.
+ * kwq/KWQCheckBox.mm: Tweak the size constants.
+ (QCheckBox::baselinePosition): Implement this. Line up baseline two pixels
+ above the bottom, not at the bottom.
+
+ * kwq/qt/qradiobutton.h: Add baselinePosition override.
+ * kwq/KWQRadioButton.mm: Tweak the size constants.
+ (QRadioButton::baselinePosition): Implement this. Line up baseline two pixels
+ above the bottom, not at the bottom.
+
2002-09-27 Chris Blumenberg <cblu at apple.com>
WebPlugin clean up.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 700096f..3d07ae5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-09-27 Darin Adler <darin at apple.com>
+
+ - fixed 2937198 -- Checkboxes and radiobuttons don't align with title control in forms
+
+ * kwq/qt/qcheckbox.h: Add baselinePosition override.
+ * kwq/KWQCheckBox.mm: Tweak the size constants.
+ (QCheckBox::baselinePosition): Implement this. Line up baseline two pixels
+ above the bottom, not at the bottom.
+
+ * kwq/qt/qradiobutton.h: Add baselinePosition override.
+ * kwq/KWQRadioButton.mm: Tweak the size constants.
+ (QRadioButton::baselinePosition): Implement this. Line up baseline two pixels
+ above the bottom, not at the bottom.
+
2002-09-27 Chris Blumenberg <cblu at apple.com>
WebPlugin clean up.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 700096f..3d07ae5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-09-27 Darin Adler <darin at apple.com>
+
+ - fixed 2937198 -- Checkboxes and radiobuttons don't align with title control in forms
+
+ * kwq/qt/qcheckbox.h: Add baselinePosition override.
+ * kwq/KWQCheckBox.mm: Tweak the size constants.
+ (QCheckBox::baselinePosition): Implement this. Line up baseline two pixels
+ above the bottom, not at the bottom.
+
+ * kwq/qt/qradiobutton.h: Add baselinePosition override.
+ * kwq/KWQRadioButton.mm: Tweak the size constants.
+ (QRadioButton::baselinePosition): Implement this. Line up baseline two pixels
+ above the bottom, not at the bottom.
+
2002-09-27 Chris Blumenberg <cblu at apple.com>
WebPlugin clean up.
diff --git a/WebCore/kwq/KWQCheckBox.h b/WebCore/kwq/KWQCheckBox.h
index 0af3f29..c3ecdbb 100644
--- a/WebCore/kwq/KWQCheckBox.h
+++ b/WebCore/kwq/KWQCheckBox.h
@@ -36,6 +36,7 @@ public:
bool isChecked();
QSize sizeHint() const;
+ int baselinePosition() const;
QRect frameGeometry() const;
void setFrameGeometry(const QRect &);
diff --git a/WebCore/kwq/KWQCheckBox.mm b/WebCore/kwq/KWQCheckBox.mm
index c64306f..97d438b 100644
--- a/WebCore/kwq/KWQCheckBox.mm
+++ b/WebCore/kwq/KWQCheckBox.mm
@@ -25,13 +25,19 @@
#import <qcheckbox.h>
-// We empirically determined that check boxes have these extra pixels on all
-// sides. It would be better to get this info from AppKit somehow.
-#define TOP_MARGIN 1
-#define BOTTOM_MARGIN 6
+// We empirically determined that check boxes have these dimensions.
+// It would be better to get this info from AppKit somehow.
+
+#define TOP_MARGIN 4
+#define BOTTOM_MARGIN 3
#define LEFT_MARGIN 3
#define RIGHT_MARGIN 3
+#define WIDTH 12
+#define HEIGHT 12
+
+#define BASELINE_MARGIN 2
+
QCheckBox::QCheckBox(QWidget *w)
: m_stateChanged(this, SIGNAL(stateChanged(int)))
{
@@ -41,7 +47,7 @@ QCheckBox::QCheckBox(QWidget *w)
QSize QCheckBox::sizeHint() const
{
- return QSize(12, 12);
+ return QSize(WIDTH, HEIGHT);
}
QRect QCheckBox::frameGeometry() const
@@ -81,3 +87,8 @@ void QCheckBox::clicked()
m_stateChanged.call(isChecked() ? 2 : 0);
QButton::clicked();
}
+
+int QCheckBox::baselinePosition() const
+{
+ return height() - BASELINE_MARGIN;
+}
diff --git a/WebCore/kwq/KWQRadioButton.h b/WebCore/kwq/KWQRadioButton.h
index c53be3a..41039d1 100644
--- a/WebCore/kwq/KWQRadioButton.h
+++ b/WebCore/kwq/KWQRadioButton.h
@@ -36,6 +36,7 @@ public:
bool isChecked() const;
QSize sizeHint() const;
+ int baselinePosition() const;
QRect frameGeometry() const;
void setFrameGeometry(const QRect &);
};
diff --git a/WebCore/kwq/KWQRadioButton.mm b/WebCore/kwq/KWQRadioButton.mm
index a0b4496..4db1b0a 100644
--- a/WebCore/kwq/KWQRadioButton.mm
+++ b/WebCore/kwq/KWQRadioButton.mm
@@ -27,12 +27,18 @@
#import <KWQView.h>
-// We empirically determined that check boxes have these extra pixels on all
-// sides. It would be better to get this info from AppKit somehow.
-#define TOP_MARGIN 1
-#define BOTTOM_MARGIN 6
-#define LEFT_MARGIN 3
-#define RIGHT_MARGIN 3
+// We empirically determined that radio buttons have these dimensions.
+// It would be better to get this info from AppKit somehow.
+
+#define TOP_MARGIN 3
+#define BOTTOM_MARGIN 3
+#define LEFT_MARGIN 2
+#define RIGHT_MARGIN 2
+
+#define WIDTH 14
+#define HEIGHT 13
+
+#define BASELINE_MARGIN 2
QRadioButton::QRadioButton(QWidget *w)
{
@@ -42,7 +48,7 @@ QRadioButton::QRadioButton(QWidget *w)
QSize QRadioButton::sizeHint() const
{
- return QSize(12, 12);
+ return QSize(WIDTH, HEIGHT);
}
QRect QRadioButton::frameGeometry() const
@@ -71,3 +77,8 @@ bool QRadioButton::isChecked() const
NSButton *button = (NSButton *)getView();
return [button state] == NSOnState;
}
+
+int QRadioButton::baselinePosition() const
+{
+ return height() - BASELINE_MARGIN;
+}
diff --git a/WebCore/kwq/qt/qcheckbox.h b/WebCore/kwq/qt/qcheckbox.h
index 0af3f29..c3ecdbb 100644
--- a/WebCore/kwq/qt/qcheckbox.h
+++ b/WebCore/kwq/qt/qcheckbox.h
@@ -36,6 +36,7 @@ public:
bool isChecked();
QSize sizeHint() const;
+ int baselinePosition() const;
QRect frameGeometry() const;
void setFrameGeometry(const QRect &);
diff --git a/WebCore/kwq/qt/qradiobutton.h b/WebCore/kwq/qt/qradiobutton.h
index c53be3a..41039d1 100644
--- a/WebCore/kwq/qt/qradiobutton.h
+++ b/WebCore/kwq/qt/qradiobutton.h
@@ -36,6 +36,7 @@ public:
bool isChecked() const;
QSize sizeHint() const;
+ int baselinePosition() const;
QRect frameGeometry() const;
void setFrameGeometry(const QRect &);
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list