[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/rendering
From:       David Faure <faure () kde ! org>
Date:       2010-04-29 18:37:38
Message-ID: 20100429183738.629DEAC7E4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1120704 by dfaure:

Revert r948588 now that KLineEdit emits textEdited correctly; makes the code simpler.
CCMAIL: germain@ebooksfrance.org


 M  +3 -7      render_form.cpp  
 M  +1 -2      render_form.h  


--- trunk/KDE/kdelibs/khtml/rendering/render_form.cpp #1120703:1120704
@@ -1013,11 +1013,11 @@
 // -----------------------------------------------------------------------------
 
 RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
-    : RenderFormElement(element), m_blockElementUpdates(false)
+    : RenderFormElement(element)
 {
     LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget());
     connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
-    connect(edit,SIGNAL(textChanged(const QString \
&)),this,SLOT(slotTextChanged(const QString &))); +    \
                connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
                
     connect(edit->completionBox(),SIGNAL(currentTextChanged(const QString \
&)),this,SLOT(slotCompletionBoxActivated(const QString &)));  
     if(element->inputType() == HTMLInputElementImpl::PASSWORD)
@@ -1144,21 +1144,17 @@
     }
 
     if (element()->value().string() != widget()->text()) {
-        m_blockElementUpdates = true;
         int pos = widget()->cursorPosition();
         widget()->setText(element()->value().string());
         widget()->setCursorPosition(pos);
-        m_blockElementUpdates = false;
     }
     widget()->setReadOnly(element()->readOnly());
 
     RenderFormElement::updateFromElement();
 }
 
-void RenderLineEdit::slotTextChanged(const QString &string)
+void RenderLineEdit::slotTextEdited(const QString &string)
 {
-    if (m_blockElementUpdates) return;
-
     // don't use setValue here!
     element()->m_value = string;
     element()->m_unsubmittedFormChange = true;
--- trunk/KDE/kdelibs/khtml/rendering/render_form.h #1120703:1120704
@@ -282,14 +282,13 @@
     void setSelectionRange(long start, long end);
 public Q_SLOTS:
     void slotReturnPressed();
-    void slotTextChanged(const QString &string);
+    void slotTextEdited(const QString &string);
     void slotCompletionBoxActivated(const QString &string);
 protected:
 
 private:
     virtual bool isEditable() const { return true; }
     virtual bool canHaveBorder() const { return true; }
-    bool m_blockElementUpdates;
 };
 
 // -------------------------------------------------------------------------


[prev in list] [next in list] [prev in thread] [next in thread]