From 052ddb74a16429edcaa80b3e8ba1b1201992236a Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sat, 20 Nov 2010 12:10:56 +0000
Subject: [PATCH] Always show a scrollbar in the smart playlist preview (avoids
 flickering when the viewport resizes), and stop the new search term widget
 responding to mouse events when it's disabled

---
 src/smartplaylists/searchpreview.ui     | 3 +++
 src/smartplaylists/searchtermwidget.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/smartplaylists/searchpreview.ui b/src/smartplaylists/searchpreview.ui
index be64db551..4f8147c69 100644
--- a/src/smartplaylists/searchpreview.ui
+++ b/src/smartplaylists/searchpreview.ui
@@ -65,6 +65,9 @@
    </item>
    <item>
     <widget class="PlaylistView" name="tree">
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOn</enum>
+     </property>
      <property name="rootIsDecorated">
       <bool>false</bool>
      </property>
diff --git a/src/smartplaylists/searchtermwidget.cpp b/src/smartplaylists/searchtermwidget.cpp
index dd77f6d4b..09b9029fd 100644
--- a/src/smartplaylists/searchtermwidget.cpp
+++ b/src/smartplaylists/searchtermwidget.cpp
@@ -159,7 +159,7 @@ void SearchTermWidget::SetActive(bool active) {
 }
 
 void SearchTermWidget::enterEvent(QEvent*) {
-  if (!overlay_)
+  if (!overlay_ || !isEnabled())
     return;
 
   animation_->stop();