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

List:       kde-commits
Subject:    kdelibs/khtml
From:       Stephan Kulow <coolo () kde ! org>
Date:       2003-10-24 15:37:20
[Download RAW message or body]

CVS commit by coolo: 

fixing rendering of disabled select options
CCMAIL: 61347-done@bugs.kde.org


  M +5 -0      ChangeLog   1.51
  M +8 -4      rendering/render_form.cpp   1.245


--- kdelibs/khtml/ChangeLog  #1.50:1.51
@@ -1,2 +1,7 @@
+2003-10-24  Stephan Kulow  <coolo@kde.org>
+
+        * rendering/render_form.cpp (updateFromElement): support disabled attribute
+        select option (#61347)
+
 2003-10-24  Lars Knoll <knoll@kde.org>
         * Make the <button> element work correctly

--- kdelibs/khtml/rendering/render_form.cpp  #1.244:1.245
@@ -1016,7 +1016,11 @@ void RenderSelect::updateFromElement()
                 }
 
-                if(m_useListBox)
-                    static_cast<KListBox*>(m_widget)->insertItem(text, listIndex);
-                else
+                if(m_useListBox) {
+                    KListBox *l = static_cast<KListBox*>(m_widget);
+                    l->insertItem(text, listIndex);
+                    DOMString disabled = optElem->getAttribute(ATTR_DISABLED);
+                    if (!disabled.isEmpty() && l->item( listIndex ))
+                        l->item( listIndex )->setSelectable( false );
+                }  else
                     static_cast<KComboBox*>(m_widget)->insertItem(text, listIndex);
             }


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