[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 07:41:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9243870755a2270b9377a9a9694c6c61de329d06
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon May 12 23:19:32 2003 +0000
Reviewed by Richard.
- fixed 3240925 -- can't select or copy text from readonly INPUT elements
An AppKit peculiarity. Calling setEditable:NO will have a side effect of
doing setSelectable:NO unless you explicitly did setSelectable:YES.
* kwq/KWQLineEdit.mm:
(QLineEdit::QLineEdit): Call setSelectable:YES.
* kwq/KWQTextField.mm:
(-[KWQTextField setPasswordMode:]): When creating the password field, keep
the setSelectable state synchronized.
(-[KWQTextField setSelectable:]): If we already have a password field, be
sure to keep its selectable state the same as the main field.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4354 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7143100..ea7b8a5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,23 @@
2003-05-12 Darin Adler <darin at apple.com>
+ Reviewed by Richard.
+
+ - fixed 3240925 -- can't select or copy text from readonly INPUT elements
+
+ An AppKit peculiarity. Calling setEditable:NO will have a side effect of
+ doing setSelectable:NO unless you explicitly did setSelectable:YES.
+
+ * kwq/KWQLineEdit.mm:
+ (QLineEdit::QLineEdit): Call setSelectable:YES.
+
+ * kwq/KWQTextField.mm:
+ (-[KWQTextField setPasswordMode:]): When creating the password field, keep
+ the setSelectable state synchronized.
+ (-[KWQTextField setSelectable:]): If we already have a password field, be
+ sure to keep its selectable state the same as the main field.
+
+2003-05-12 Darin Adler <darin at apple.com>
+
Reviewed by John.
- fixed 3255281 -- REGRESSION: objc_error in key loop code, closing tab containing aintitcool.com page
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7143100..ea7b8a5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,23 @@
2003-05-12 Darin Adler <darin at apple.com>
+ Reviewed by Richard.
+
+ - fixed 3240925 -- can't select or copy text from readonly INPUT elements
+
+ An AppKit peculiarity. Calling setEditable:NO will have a side effect of
+ doing setSelectable:NO unless you explicitly did setSelectable:YES.
+
+ * kwq/KWQLineEdit.mm:
+ (QLineEdit::QLineEdit): Call setSelectable:YES.
+
+ * kwq/KWQTextField.mm:
+ (-[KWQTextField setPasswordMode:]): When creating the password field, keep
+ the setSelectable state synchronized.
+ (-[KWQTextField setSelectable:]): If we already have a password field, be
+ sure to keep its selectable state the same as the main field.
+
+2003-05-12 Darin Adler <darin at apple.com>
+
Reviewed by John.
- fixed 3255281 -- REGRESSION: objc_error in key loop code, closing tab containing aintitcool.com page
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index c42ddcc..36b9909 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -37,7 +37,8 @@ QLineEdit::QLineEdit()
, m_textChanged(this, SIGNAL(textChanged(const QString &)))
, m_clicked(this, SIGNAL(clicked()))
{
- NSView *view = [[KWQTextField alloc] initWithQLineEdit:this];
+ KWQTextField *view = [[KWQTextField alloc] initWithQLineEdit:this];
+ [view setSelectable:YES]; // must do this explicitly so setEditable:NO does not make it NO
setView(view);
[view release];
}
@@ -96,7 +97,7 @@ bool QLineEdit::isReadOnly() const
void QLineEdit::setReadOnly(bool flag)
{
KWQTextField *textField = (KWQTextField *)getView();
- return [textField setEditable:!flag];
+ [textField setEditable:!flag];
}
int QLineEdit::maxLength() const
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index 5ffcbe8..fd6c6b5 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -147,6 +147,7 @@
[secureField setFormatter:formatter];
[secureField setFont:[self font]];
[secureField setEditable:[self isEditable]];
+ [secureField setSelectable:[self isSelectable]];
[self setUpTextField:secureField];
[self updateSecureFieldFrame];
}
@@ -161,6 +162,12 @@
[super setEditable:flag];
}
+- (void)setSelectable:(BOOL)flag
+{
+ [secureField setSelectable:flag];
+ [super setSelectable:flag];
+}
+
- (void)selectText:(id)sender
{
if ([self passwordMode]) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list