From 5da26eee6914bf5f2645e54e12d18a041db24cb8 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Mon, 24 Aug 2015 06:40:03 +0200
Subject: [PATCH] #122 fixed.

---
 resources/text/CHANGELOG |  1 +
 src/gui/feedsview.cpp    | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index f1ef2fc33..e13676290 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -23,6 +23,7 @@
   
   Fixed:
   <ul>
+    <li>Categories are now not expanded when selected using "Go to next/previous item" in feeds list. (bug #122)</li>
   <ul>
   
   <hr/>
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index 69d69ff74..70d4022f7 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -415,7 +415,7 @@ void FeedsView::restoreRecycleBin() {
   emit feedsNeedToBeReloaded(true);
 }
 
-void FeedsView::updateCountsOfSelectedFeeds(bool update_total_too) { 
+void FeedsView::updateCountsOfSelectedFeeds(bool update_total_too) {
   foreach (Feed *feed, selectedFeeds()) {
     feed->updateCounts(update_total_too);
   }
@@ -469,9 +469,12 @@ void FeedsView::updateCountsOfParticularFeed(Feed *feed, bool update_total_too)
 }
 
 void FeedsView::selectNextItem() {
+  // NOTE: Bug #122 requested to not expand in here.
+  /*
   if (!isExpanded(currentIndex())) {
     expand(currentIndex());
   }
+  */
 
   QModelIndex index_next = moveCursor(QAbstractItemView::MoveDown, Qt::NoModifier);
 
@@ -485,11 +488,13 @@ void FeedsView::selectNextItem() {
 void FeedsView::selectPreviousItem() {
   QModelIndex index_previous = moveCursor(QAbstractItemView::MoveUp, Qt::NoModifier);
 
+  // NOTE: Bug #122 requested to not expand in here.
+  /*
   if (!isExpanded(index_previous)) {
     expand(index_previous);
+    index_previous = moveCursor(QAbstractItemView::MoveUp, Qt::NoModifier);
   }
-
-  index_previous = moveCursor(QAbstractItemView::MoveUp, Qt::NoModifier);
+  */
 
   if (index_previous.isValid()) {
     setCurrentIndex(index_previous);