Animate most of the bars

When a bar is toggled visible this usually happens because the
user might want to use its functionality now. However, if bars
appear without animation or at a location the user is not
currently looking at, they might not notice that they have appeared
at all.

An animation makes it more likely that the user notices the change
and can then use the newly made visible component.

Another reason for animations for showing or hiding of components
is that it can be disorienting for users when panels or bars
suddenly appear or disappear without animation. There is no visible
movement then, so the user might not know what happened if they
didn't concentrate or blink at that moment. The newly appearing or
disappearing component might also displace other components which
can make it difficult to find what one was just looking at.

These bars animate now after this change:
- Search panel
- Filter bar
- Status bar

This is implemented by extracting the animation code from
SelectionMode::TopBar into a new abstract base class
AnimatedHeightWidget. This class is now also used in
SelectionMode::BottomBar and the animating code there was removed.

These bars are left in Dolphin that stay without animation:
- Menu bar (Would probably need to be implemented in KXmlGui)
- Tool bar (Would probably need to be implemented in KXmlGui)
- Tab bar (Needs a different appraoch because it already inherits
QTabBar and therefore can not inherit AnimatedHeightWidget)

1 files changed, 13 insertions, 53 deletions

diff --git a/src/selectionmode/bottombar.cpp b/src/selectionmode/bottombar.cpp
index b40fc95db..ee63246ca 100644
--- a/src/selectionmode/bottombar.cpp
+++ b/src/selectionmode/bottombar.cpp
@@ -12,36 +12,16 @@
 
 #include <QGridLayout>
 #include <QResizeEvent>
-#include <QScrollArea>
 #include <QStyle>
 #include <QTimer>
 
 using namespace SelectionMode;
 
 BottomBar::BottomBar(KActionCollection *actionCollection, QWidget *parent)
-    : QWidget{parent}
+    : AnimatedHeightWidget{parent}
 {
-    // Showing of this widget is normally animated. We hide it for now and make it small.
-    hide();
-    setMaximumHeight(0);
-
-    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-    setMinimumWidth(0);
-
-    auto fillParentLayout = new QGridLayout(this);
-    fillParentLayout->setContentsMargins(0, 0, 0, 0);
-
-    // Put the contents into a QScrollArea. This prevents increasing the view width
-    // in case that not enough width for the contents is available. (this trick is also used in dolphinsearchbox.cpp.)
-    m_scrollArea = new QScrollArea(this);
-    fillParentLayout->addWidget(m_scrollArea);
-    m_scrollArea->setFrameShape(QFrame::NoFrame);
-    m_scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_scrollArea->setWidgetResizable(true);
-
-    m_contentsContainer = new BottomBarContentsContainer(actionCollection, m_scrollArea);
-    m_scrollArea->setWidget(m_contentsContainer);
+    m_contentsContainer = new BottomBarContentsContainer(actionCollection, nullptr);
+    prepareContentsContainer(m_contentsContainer);
     m_contentsContainer->installEventFilter(this); // Adjusts the height of this bar to the height of the contentsContainer
     connect(m_contentsContainer, &BottomBarContentsContainer::error, this, &BottomBar::error);
     connect(m_contentsContainer, &BottomBarContentsContainer::barVisibilityChangeRequested, this, [this](bool visible) {
@@ -52,6 +32,7 @@ BottomBar::BottomBar(KActionCollection *actionCollection, QWidget *parent)
     });
     connect(m_contentsContainer, &BottomBarContentsContainer::selectionModeLeavingRequested, this, &BottomBar::selectionModeLeavingRequested);
 
+    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     BackgroundColorHelper::instance()->controlBackgroundColor(this);
 }
 
@@ -63,7 +44,6 @@ void BottomBar::setVisible(bool visible, Animated animated)
 
 void BottomBar::setVisibleInternal(bool visible, Animated animated)
 {
-    Q_ASSERT_X(animated == WithAnimation, "SelectionModeBottomBar::setVisible", "This wasn't implemented.");
     if (!visible && contents() == PasteContents) {
         return; // The bar with PasteContents should not be hidden or users might not know how to paste what they just copied.
                 // Set contents to anything else to circumvent this prevention mechanism.
@@ -72,32 +52,7 @@ void BottomBar::setVisibleInternal(bool visible, Animated animated)
         return; // There is nothing on the bar that we want to show. We keep it invisible and only show it when the selection or the contents change.
     }
 
-    setEnabled(visible);
-    if (m_heightAnimation) {
-        m_heightAnimation->stop(); // deletes because of QAbstractAnimation::DeleteWhenStopped.
-    }
-    m_heightAnimation = new QPropertyAnimation(this, "maximumHeight");
-    m_heightAnimation->setDuration(2 * style()->styleHint(QStyle::SH_Widget_Animation_Duration, nullptr, this) * GlobalConfig::animationDurationFactor());
-    m_heightAnimation->setStartValue(height());
-    m_heightAnimation->setEasingCurve(QEasingCurve::OutCubic);
-    if (visible) {
-        show();
-        m_heightAnimation->setEndValue(sizeHint().height());
-        connect(m_heightAnimation, &QAbstractAnimation::finished, this, [this]() {
-            setMaximumHeight(sizeHint().height());
-        });
-    } else {
-        m_heightAnimation->setEndValue(0);
-        connect(m_heightAnimation, &QAbstractAnimation::finished, this, &QWidget::hide);
-    }
-
-    m_heightAnimation->start(QAbstractAnimation::DeleteWhenStopped);
-}
-
-QSize BottomBar::sizeHint() const
-{
-    return QSize{1, m_contentsContainer->sizeHint().height()};
-    // 1 as width because this widget should never be the reason the DolphinViewContainer is made wider.
+    AnimatedHeightWidget::setVisible(visible, animated);
 }
 
 void BottomBar::slotSelectionChanged(const KFileItemList &selection, const QUrl &baseUrl)
@@ -139,7 +94,7 @@ bool BottomBar::eventFilter(QObject *watched, QEvent *event)
     case QEvent::ChildRemoved:
         QTimer::singleShot(0, this, [this]() {
             // The necessary height might have changed because of the added/removed child so we change the height manually.
-            if (isVisibleTo(parentWidget()) && isEnabled() && (!m_heightAnimation || m_heightAnimation->state() != QAbstractAnimation::Running)) {
+            if (isVisibleTo(parentWidget()) && isEnabled() && !isAnimationRunning()) {
                 setMaximumHeight(sizeHint().height());
             }
         });
@@ -153,12 +108,17 @@ void BottomBar::resizeEvent(QResizeEvent *resizeEvent)
 {
     if (resizeEvent->oldSize().width() == resizeEvent->size().width()) {
         // The width() didn't change so our custom override isn't needed.
-        return QWidget::resizeEvent(resizeEvent);
+        return AnimatedHeightWidget::resizeEvent(resizeEvent);
     }
 
     m_contentsContainer->adaptToNewBarWidth(width());
 
-    return QWidget::resizeEvent(resizeEvent);
+    return AnimatedHeightWidget::resizeEvent(resizeEvent);
+}
+
+int BottomBar::preferredHeight() const
+{
+    return m_contentsContainer->sizeHint().height();
 }
 
 #include "moc_bottombar.cpp"