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

List:       kde-commits
Subject:    kdelibs/khtml
From:       Jean-Baptiste Mardelle <bj () altern ! org>
Date:       2004-08-07 9:52:50
Message-ID: 20040807095250.B9B81926D () office ! kde ! org
[Download RAW message or body]

CVS commit by mardelle: 

Accesskeys should not conflict with zoom or ctrl+left mouse click


  M +5 -0      khtmlview.cpp   1.661


--- kdelibs/khtml/khtmlview.cpp  #1.660:1.661
@@ -2401,4 +2401,7 @@ bool KHTMLView::dispatchMouseEvent(int e
             break;
     }
+    if (d->accessKeysPreActivate && button!=-1) 
+        d->accessKeysPreActivate=false;
+        
     bool ctrlKey = (_mouse->state() & ControlButton);
     bool altKey = (_mouse->state() & AltButton);
@@ -2487,4 +2490,6 @@ void KHTMLView::setIgnoreWheelEvents( bo
 void KHTMLView::viewportWheelEvent(QWheelEvent* e)
 {
+    if (d->accessKeysPreActivate) d->accessKeysPreActivate=false;
+
     if ( ( e->state() & ControlButton) == ControlButton )
     {


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