From 8a4e5879316d9c6fcbc6e3474828d13e992d8dda Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 13 Oct 2010 23:40:19 +0000 Subject: [PATCH] forwardport r1185627 okular/branches/KDE/4.5/kdegraphics/okular/ui/sidebar.cpp: make sure the list is shown all the times we show the sidecontainer forwardport r1185628 okular/branches/KDE/4.5/kdegraphics/okular/ui/sidebar.cpp: no need to look for a new current item if the sidebar is not even shown svn path=/trunk/KDE/kdegraphics/okular/; revision=1185629 --- ui/sidebar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/sidebar.cpp b/ui/sidebar.cpp index f6d1a5fe3..ac90b46ec 100644 --- a/ui/sidebar.cpp +++ b/ui/sidebar.cpp @@ -550,7 +550,7 @@ void Sidebar::setItemEnabled( int index, bool enabled ) } d->pages.at( index )->setFlags( f ); - if ( !enabled && index == currentIndex() ) + if ( !enabled && index == currentIndex() && isSidebarVisible() ) // find an enabled item, and select that one for ( int i = 0; i < d->pages.count(); ++i ) if ( d->pages.at(i)->flags() & Qt::ItemIsEnabled ) @@ -629,6 +629,7 @@ void Sidebar::itemClicked( QListWidgetItem *item ) else { d->sideContainer->show(); + d->list->show(); } } else