X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2e588733c759cccd2d86e34a3a394b9a8ab0c800..38c34eeca:/src/selectionmode/bottombar.cpp?ds=sidebyside diff --git a/src/selectionmode/bottombar.cpp b/src/selectionmode/bottombar.cpp index 529384435..f39431076 100644 --- a/src/selectionmode/bottombar.cpp +++ b/src/selectionmode/bottombar.cpp @@ -7,21 +7,19 @@ #include "bottombar.h" -#include "bottombarcontentscontainer.h" #include "backgroundcolorhelper.h" -#include "global.h" +#include "bottombarcontentscontainer.h" #include #include #include #include -#include #include using namespace SelectionMode; -BottomBar::BottomBar(KActionCollection *actionCollection, QWidget *parent) : - QWidget{parent} +BottomBar::BottomBar(KActionCollection *actionCollection, QWidget *parent) + : QWidget{parent} { // Showing of this widget is normally animated. We hide it for now and make it small. hide(); @@ -46,7 +44,7 @@ BottomBar::BottomBar(KActionCollection *actionCollection, QWidget *parent) : m_scrollArea->setWidget(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){ + connect(m_contentsContainer, &BottomBarContentsContainer::barVisibilityChangeRequested, this, [this](bool visible) { if (!m_allowedToBeVisible && visible) { return; } @@ -79,20 +77,18 @@ void BottomBar::setVisibleInternal(bool visible, Animated animated) 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->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()); }); + connect(m_heightAnimation, &QAbstractAnimation::finished, this, [this]() { + setMaximumHeight(sizeHint().height()); + }); } else { m_heightAnimation->setEndValue(0); - connect(m_heightAnimation, &QAbstractAnimation::finished, - this, &QWidget::hide); + connect(m_heightAnimation, &QAbstractAnimation::finished, this, &QWidget::hide); } m_heightAnimation->start(QAbstractAnimation::DeleteWhenStopped);