Changeset 24482 in webkit

Timestamp:

Jul 20, 2007 9:52:51 AM (17 years ago)

Author:

zbujtas

Message:

raalexan, reviewed by Zalan

DESC: AJPA-74XD84 Some input format doesn't work properly.
​http://bugs.webkit.org/show_bug.cgi?id=14661

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/rendering/render_form.cpp (modified) (1 diff)
• kwq/KWQTextEdit.cpp (modified) (8 diffs)
• kwq/KWQTextEdit.h (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+raalexan, reviewed by Zalan
+ DESC: AJPA-74XD84 Some input format doesn't work properly.
+ http://bugs.webkit.org/show_bug.cgi?id=14661
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/rendering/render_form.cpp:
+        (RenderTextArea::setStyle):
+        * kwq/KWQTextEdit.cpp:
+        (QTextEdit::setInputRequiredFormat):
+        * kwq/KWQTextEdit.h:
+        (QTextEdit::):
+
 2007-06-29  bujtas  <zbujtas@gmail.com>
 

S60/trunk/WebCore/khtml/rendering/render_form.cpp

@@ -1701 +1701 @@
     w->setLineHeight(RenderObject::lineHeight(true));
 
+    bool inputRequired = s->inputRequired();
+    QString inputFormat = s->inputFormat();
+    w->setInputRequiredFormat(inputRequired, inputFormat);
 #if APPLE_CHANGES
     w->setWritingDirection(style()->direction() == RTL ? QPainter::RTL : QPainter::LTR);

S60/trunk/WebCore/kwq/KWQTextEdit.cpp

@@ -35 +35 @@
 
     _textWidget = TWebCoreFormControlFactory::Factory()->ConstructText(inputType );
-        if (_textWidget)
-        {
+  if (_textWidget)
+  {
     _textWidget->SetEventHandler(this);
     setView(_textWidget);
-        }
+  }
 }
 
 QTextEdit::~QTextEdit()
 {
-        if (_textWidget)
-        {
-                _textWidget->Close();
-        }
+  if (_textWidget)
+  {
+    _textWidget->Close();
+  }
 }
 
@@ -53 +53 @@
 void QTextEdit::setText(const QString &string)
 {
-        if (_textWidget)
-        {
-                _textWidget->SetText(string.Des());
-        }
+  if (_textWidget)
+  {
+    _textWidget->SetText(string.Des());
+  }
 }
 
 QString QTextEdit::text() const
 {
-        if (_textWidget)
-        {
-                return QString::FromDes(_textWidget->Text());
-        }
-        return QString();
+  if (_textWidget)
+  {
+    return QString::FromDes(_textWidget->Text());
+  }
+  return QString();
 }
 
 QString QTextEdit::textWithHardLineBreaks() const
 {
-        return text();
+  return text();
 }
 
@@ -117 +117 @@
 bool QTextEdit::isReadOnly() const
 {
-        if (_textWidget)
-        {
-                return _textWidget->IsReadOnly();
-        }
-        return false;
+  if (_textWidget)
+  {
+    return _textWidget->IsReadOnly();
+  }
+  return false;
 }
 
 void QTextEdit::setReadOnly(bool flag)
 {
-        if (_textWidget)
-        {
-                _textWidget->SetReadOnly(flag);
-        }
+  if (_textWidget)
+  {
+    _textWidget->SetReadOnly(flag);
+  }
 }
 
 bool QTextEdit::isDisabled() const
 {
-        if (_textWidget)
-        {
-                return _textWidget->IsDisabled();
-        }
-        return false;
+  if (_textWidget)
+  {
+    return _textWidget->IsDisabled();
+  }
+  return false;
 }
 
 void QTextEdit::setDisabled(bool flag)
 {
-        if (_textWidget)
-        {
-                _textWidget->SetDisabled(flag);
-        }
+  if (_textWidget)
+  {
+    _textWidget->SetDisabled(flag);
+  }
 }
 
@@ -156 +156 @@
 void QTextEdit::setFont(const QFont &font)
 {
-        QWidget::setFont(font);
-        if (_textWidget)
-        {
-                QFont fontCpy = font;
-                CFont* symFont = const_cast<CFont*>(fontCpy.Font());
-                _textWidget->SetFont(symFont );
-        }
+  QWidget::setFont(font);
+  if (_textWidget)
+  {
+    QFont fontCpy = font;
+    CFont* symFont = const_cast<CFont*>(fontCpy.Font());
+    _textWidget->SetFont(symFont );
+  }
 }
 
 bool QTextEdit::isActive() const
 {
-        if (_textWidget)
-        {
-                return _textWidget->IsActive();
-        }
-        return false;
+  if (_textWidget)
+  {
+    return _textWidget->IsActive();
+  }
+  return false;
 }
 
 void QTextEdit::deActivate(bool acceptChanges)
 {
-        if (_textWidget)
-        {
-                _textWidget->DeActivate(acceptChanges);
-        }
+  if (_textWidget)
+  {
+    _textWidget->DeActivate(acceptChanges);
+  }
 }
 
@@ -214 +214 @@
 QSize QTextEdit::sizeWithColumnsAndRows(int numColumns, int numRows) const
 {
-        if (_textWidget)
-        {
-                _textWidget->SetSize(numColumns);
-                _textWidget->SetHeight(numRows);
-                return QSize(_textWidget->SizeForCharacterWidth(numColumns));
-        }
-        return QSize(0,0);
+  if (_textWidget)
+  {
+    _textWidget->SetSize(numColumns);
+    _textWidget->SetHeight(numRows);
+    return QSize(_textWidget->SizeForCharacterWidth(numColumns));
+  }
+  return QSize(0,0);
 }
 
@@ -226 +226 @@
 QRect QTextEdit::frameGeometry() const
 {
-        if(_textWidget)
-        {
-                return QRect(_textWidget->Rect());
-        }
-        return QRect();
+  if(_textWidget)
+  {
+    return QRect(_textWidget->Rect());
+  }
+  return QRect();
 }
 
 void QTextEdit::setFrameGeometry(const QRect &r)
 {
-        if(_textWidget)
-        {
-                _textWidget->SetRect(r.Rect());
-        }
+  if(_textWidget)
+  {
+    _textWidget->SetRect(r.Rect());
+  }
 }
 
@@ -244 +244 @@
 QWidget::FocusPolicy QTextEdit::focusPolicy() const
 {
-        return TabFocus;
+  return TabFocus;
 }
 
@@ -278 +278 @@
 void QTextEdit::paint(QPainter *aPainter, const QRect& aRect)
 {
-        TRect rect = aRect.Rect();
-        if (_textWidget)
-        {
-                _textWidget->Draw(aPainter->Gc(), rect);
-        }
+  TRect rect = aRect.Rect();
+  if (_textWidget)
+  {
+    _textWidget->Draw(aPainter->Gc(), rect);
+  }
 }
 
 void QTextEdit::HandleEvent(TEvent aEvent)
 {
-        if(aEvent == EValueChanged)
-        {
-                textChanged();
-        }
-        else if (aEvent == EFocusOut && eventFilterObject())
-        {
+  if(aEvent == EValueChanged)
+  {
+    textChanged();
+  }
+  else if (aEvent == EFocusOut && eventFilterObject())
+  {
         QFocusEvent event(QEvent::FocusOut);
         const_cast<QObject *>(eventFilterObject())->eventFilter(this, &event);
-        }
-
-}
-
+  }
+
+}
+
+void QTextEdit::setInputRequiredFormat(bool aInputRequired, QString aInputFormat)
+{
+    if (_textWidget)
+    {
+      _textWidget->SetInputRequiredFormat(!aInputRequired, aInputFormat.Des());
+    }
+}
+
+

S60/trunk/WebCore/kwq/KWQTextEdit.h

@@ -38 +38 @@
  public:
     typedef enum {
-        NoWrap,
-        WidgetWidth
+  NoWrap,
+  WidgetWidth
     } WrapStyle;
 
     typedef enum {
-        PlainText,
+  PlainText,
     } TextFormat;
 
@@ -106 +106 @@
     void paint(QPainter *, const QRect &);
     void HandleEvent(TEvent aEvent);
+    void setInputRequiredFormat(bool aInputRequired,
+       QString aInputFormat); 
 
   private: