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

List:       kde-commits
Subject:    KDE/kdelibs/kfile
From:       Jonathan Marten <jjm () keelhaul ! me ! uk>
Date:       2010-04-17 7:26:21
Message-ID: 20100417072621.77505AC89C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1115714 by marten:

Do not switch the old-style URL combo box back to breadcrumb
navigation mode if the Escape key is pressed while the combo box
is open.

Review at http://reviewboard.kde.org/r/3613/

BUG:200842


 M  +3 -2      kurlnavigator.cpp  
 M  +2 -2      kurlnavigator.h  


--- trunk/KDE/kdelibs/kfile/kurlnavigator.cpp #1115713:1115714
@@ -1152,11 +1152,12 @@
     d->m_history[d->m_historyIndex].pos = QPoint(x, y);
 }
 
-void KUrlNavigator::keyReleaseEvent(QKeyEvent* event)
+void KUrlNavigator::keyPressEvent(QKeyEvent* event)
 {
-    QWidget::keyReleaseEvent(event);
     if (isUrlEditable() && (event->key() == Qt::Key_Escape)) {
         setUrlEditable(false);
+    } else {
+        QWidget::keyPressEvent(event);
     }
 }
 
--- trunk/KDE/kdelibs/kfile/kurlnavigator.h #1115713:1115714
@@ -424,9 +424,9 @@
     /*
      * If the Escape key is pressed, the navigation bar should switch
      * to the breadcrumb view.
-     * @see QWidget::keyReleaseEvent()
+     * @see QWidget::keyPressEvent()
      */
-    virtual void keyReleaseEvent(QKeyEvent* event);
+    virtual void keyPressEvent(QKeyEvent* event);
 
     /*
      * Paste the clipboard content as URL, if the middle mouse
[prev in list] [next in list] [prev in thread] [next in thread]