fix #1401 and upgrade ChangeLog

2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b5d27c3..7228691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,18 +5,21 @@
 	* Fifteen gained configurable number of items (zecke)
 	* Fifteen can have custom background images (zecke)
 	* Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
 	* Integrated the new security framework into libopie2 (zecke,clem)
 	* Converted the launcher to use the new security framework (zecke)
 	* Backup can now handle custom locations for backup and restore (ar)
+	* Implemented right-on-hold feedback (wimpie,zecke)
+	* Lots of new features in opie-reader (tim,pohly)
 
 	Fixed Bugs
 	--------
 	* #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
 	* #1361 - Fixed auto upercase in Opie-Addressbook (eilers) 
 	* #1370 - Pimconverter now reacts on cancel key (eilers)
+	* #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
 
 2004-07-06	The Opie Team <opie@handhelds.org>
 
 	* Tagged as Version 1.1.4 (devel)
 
 	New Features
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index e86f389..0d0f2cb 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -655,14 +655,12 @@ void LauncherView::setToolsEnabled(bool y)
 	    typemb->setSizePolicy(p);
 
 	    // Category filter
 	    updateTools();
 	    tools->show();
 
-	    // Always show vscrollbar
-	    icons->setVScrollBarMode( QScrollView::AlwaysOn );
 	} else {
 	    delete tools;
 	    tools = 0;
 	}
     }
 }