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

List:       kde-commits
Subject:    KDE/kdelibs/kate
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2010-12-28 13:10:51
Message-ID: 20101228131051.72FEDAC8AD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209887 by cullmann:

mwolff:

    fix regression introduced in f52c93919a158decd3399d0893efa49e57547009
    properly set the current index in addCurrentTextToHistory
    
BUG: 248305



 M  +3 -8      search/katesearchbar.cpp  
 M  +0 -1      search/katesearchbar.h  
 M  +6 -0      tests/searchbar_test.cpp  


--- trunk/KDE/kdelibs/kate/search/katesearchbar.cpp #1209886:1209887
@@ -663,9 +663,11 @@
 
     if (index > 0)
         combo->removeItem(index);
-    if (index != 0)
+    if (index != 0) {
         combo->insertItem(0, text);
+        combo->setCurrentIndex(0);
 }
+}
 
 
 
@@ -1491,13 +1493,6 @@
 }
 
 
-
-void KateSearchBar::closed() {
-    // empty, can probably be removed
-}
-
-
-
 void KateSearchBar::updateSelectionOnly() {
     if (m_powerUi == NULL) {
         return;
--- trunk/KDE/kdelibs/kate/search/katesearchbar.h #1209886:1209887
@@ -112,7 +112,6 @@
 protected:
     // Overridden
     virtual void showEvent(QShowEvent * event);
-    virtual void closed();
 
 private Q_SLOTS:
     void onIncPatternChanged(const QString & pattern);
--- trunk/KDE/kdelibs/kate/tests/searchbar_test.cpp #1209886:1209887
@@ -564,6 +564,12 @@
 
   QCOMPARE(bar2.m_incUi->pattern->findText("bar"), 0);
   QCOMPARE(bar2.m_incUi->pattern->findText("foo"), 1);
+
+  //testcase for https://bugs.kde.org/show_bug.cgi?id=248305
+  bar2.m_incUi->pattern->setCurrentIndex(1);
+  QCOMPARE(bar2.searchPattern(), QLatin1String("foo"));
+  bar2.findNext();
+  QCOMPARE(bar2.searchPattern(), QLatin1String("foo"));
 }
 
 void SearchBarTest::testSearchHistoryPower()
[prev in list] [next in list] [prev in thread] [next in thread]