From kde-commits  Sat Oct 18 17:15:22 2008
From: Maks Orlovich <maksim () kde ! org>
Date: Sat, 18 Oct 2008 17:15:22 +0000
To: kde-commits
Subject: branches/KDE/4.1/kdelibs/khtml
Message-Id: <1224350122.090782.21370.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122435013017981

SVN commit 873068 by orlovich:

Fixed disabled <button> dispatching events and getting pressed-down.
Probably want to tweak the CSS some more to grey out the font, though.

BUG:170159


 M  +1 -1      css/html4.css  
 M  +2 -4      khtmlview.cpp  


--- branches/KDE/4.1/kdelibs/khtml/css/html4.css #873067:873068
@@ -341,7 +341,7 @@
         cursor: default;
 }
 
-button:active {
+button:enabled:active {
         border-style: inset;
 }
 
--- branches/KDE/4.1/kdelibs/khtml/khtmlview.cpp #873067:873068
@@ -1303,8 +1303,6 @@
                                            d->clickCount,_mouse,true,DOM::NodeImpl::MouseDblClick);
 
     khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
-    if (r && r->isWidget() && !static_cast<RenderWidget*>(r)->isDisabled())
-	_mouse->ignore();
 
     if (!swallowEvent) {
 	khtml::MouseDoubleClickEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode, d->clickCount );
@@ -3666,8 +3664,8 @@
 
     if (targetNode) {
 	// if the target node is a disabled widget, we don't want any full-blown mouse events
-	khtml::RenderObject* r = targetNode ? targetNode->renderer() : 0;
-	if (r && r->isWidget() && static_cast<RenderWidget*>(r)->isDisabled())
+	if (targetNode->isGenericFormElement()
+	     && static_cast<HTMLGenericFormElementImpl*>(targetNode)->disabled())
 	    return true;
 
         // send the actual event