SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / animatedheightwidget.cpp

diff --git a/src/animatedheightwidget.cpp b/src/animatedheightwidget.cpp
index cee1a4922256b9f273f85b524b9a22f772b5e5eb..cd62f39715b621a3fa8fe1c38bb3398e6db4d6e5 100644 (file)
--- a/src/animatedheightwidget.cpp
+++ b/src/animatedheightwidget.cpp
@@ -10,6 +10,7 @@
 #include <QGridLayout>
 #include <QPropertyAnimation>
 #include <QScrollArea>
+#include <QScrollBar>
 #include <QStyle>
 
 AnimatedHeightWidget::AnimatedHeightWidget(QWidget *parent)
@@ -30,6 +31,9 @@ AnimatedHeightWidget::AnimatedHeightWidget(QWidget *parent)
     m_contentsContainerParent->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_contentsContainerParent->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_contentsContainerParent->setWidgetResizable(true);
+    // Disables manual scrolling, for example with mouse scrollwheel.
+    m_contentsContainerParent->verticalScrollBar()->setEnabled(false);
+    m_contentsContainerParent->horizontalScrollBar()->setEnabled(false);
 
     setMinimumWidth(0);
 }
@@ -81,6 +85,7 @@ QWidget *AnimatedHeightWidget::prepareContentsContainer(QWidget *contentsContain
                "Another contentsContainer has already been prepared. There can only be one.");
     contentsContainer->setParent(m_contentsContainerParent);
     m_contentsContainerParent->setWidget(contentsContainer);
+    m_contentsContainerParent->setFocusProxy(contentsContainer);
     return contentsContainer;
 }