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

[dolphin.git] / src / selectionmode / bottombar.cpp

diff --git a/src/selectionmode/bottombar.cpp b/src/selectionmode/bottombar.cpp
index 4ca184a6dfade54033355b3d150743b59f085af3..ee63246caae8a3ae2d219546b7ea9a245d64e949 100644 (file)
--- a/src/selectionmode/bottombar.cpp
+++ b/src/selectionmode/bottombar.cpp
@@ -1,59 +1,38 @@
 /*
     This file is part of the KDE project
 /*
     This file is part of the KDE project

-    SPDX-FileCopyrightText: 2022 Felix Ernst <felixernst@zohomail.eu>
+    SPDX-FileCopyrightText: 2022 Felix Ernst <felixernst@kde.org>

 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
 
 #include "bottombar.h"
 
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
 
 #include "bottombar.h"
 

-#include "bottombarcontentscontainer.h"

 #include "backgroundcolorhelper.h"
 #include "backgroundcolorhelper.h"

-#include "global.h"
+#include "bottombarcontentscontainer.h"

 
 #include <QGridLayout>
 #include <QResizeEvent>
 
 #include <QGridLayout>
 #include <QResizeEvent>

-#include <QScrollArea>

 #include <QStyle>
 #include <QStyle>

-#include <QtGlobal>

 #include <QTimer>
 
 using namespace SelectionMode;
 
 #include <QTimer>
 
 using namespace SelectionMode;
 

-BottomBar::BottomBar(KActionCollection *actionCollection, QWidget *parent) :
-    QWidget{parent}
+BottomBar::BottomBar(KActionCollection *actionCollection, 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);
     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){
+    connect(m_contentsContainer, &BottomBarContentsContainer::barVisibilityChangeRequested, this, [this](bool visible) {

         if (!m_allowedToBeVisible && visible) {
             return;
         }
         setVisibleInternal(visible, WithAnimation);
     });
         if (!m_allowedToBeVisible && visible) {
             return;
         }
         setVisibleInternal(visible, WithAnimation);
     });

-    connect(m_contentsContainer, &BottomBarContentsContainer::leaveSelectionModeRequested, this, &BottomBar::leaveSelectionModeRequested);
+    connect(m_contentsContainer, &BottomBarContentsContainer::selectionModeLeavingRequested, this, &BottomBar::selectionModeLeavingRequested);

 
 

+    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);

     BackgroundColorHelper::instance()->controlBackgroundColor(this);
 }
 
     BackgroundColorHelper::instance()->controlBackgroundColor(this);
 }
 


@@ -65,7 +44,6 @@ void BottomBar::setVisible(bool visible, Animated animated)
 
 void BottomBar::setVisibleInternal(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.
     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.


@@ -74,34 +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.
     }
 
         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)
 }
 
 void BottomBar::slotSelectionChanged(const KFileItemList &selection, const QUrl &baseUrl)


@@ -114,7 +65,7 @@ void BottomBar::slotSplitTabDisabled()
     switch (contents()) {
     case CopyToOtherViewContents:
     case MoveToOtherViewContents:
     switch (contents()) {
     case CopyToOtherViewContents:
     case MoveToOtherViewContents:

-        Q_EMIT leaveSelectionModeRequested();
+        Q_EMIT selectionModeLeavingRequested();

     default:
         return;
     }
     default:
         return;
     }


@@ -143,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.
     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());
             }
         });
                 setMaximumHeight(sizeHint().height());
             }
         });


@@ -157,10 +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.
 {
     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());
 
     }
 
     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"