X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/07f31c208790eaff918d7f08f442840c088dbe78..refs/heads/master:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 79f2de2c4..f81120a44 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -1,300 +1,366 @@ -/*************************************************************************** - * Copyright (C) 2006 by Peter Penz * - * peter.penz@gmx.at * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2006-2012 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphinstatusbar.h" -#include "settings/dolphinsettings.h" -#include "dolphinview.h" + #include "dolphin_generalsettings.h" -#include "statusbarmessagelabel.h" #include "statusbarspaceinfo.h" -#include "zoomlevelinfo.h" +#include "views/dolphinview.h" +#include "views/zoomlevelinfo.h" + +#include +#include #include #include -#include +#include +#include +#include +#include +#include #include -#include +#include +#include #include +#include -#include -#include -#include -#include - -DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : - KHBox(parent), - m_view(view), - m_messageLabel(0), - m_spaceInfo(0), - m_zoomWidget(0), - m_zoomOut(0), - m_zoomSlider(0), - m_zoomIn(0), - m_progressBar(0), - m_progress(100), - m_messageTimeStamp() +namespace { - setMargin(0); - setSpacing(4); +const int UpdateDelay = 50; +} - connect(m_view, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(updateSpaceInfoContent(const KUrl&))); +DolphinStatusBar::DolphinStatusBar(QWidget *parent) + : AnimatedHeightWidget(parent) + , m_text() + , m_defaultText() + , m_label(nullptr) + , m_zoomLabel(nullptr) + , m_spaceInfo(nullptr) + , m_zoomSlider(nullptr) + , m_progressBar(nullptr) + , m_stopButton(nullptr) + , m_progress(100) + , m_showProgressBarTimer(nullptr) + , m_delayUpdateTimer(nullptr) + , m_textTimestamp() +{ + setProperty("_breeze_statusbar_separator", true); - // initialize message label - m_messageLabel = new StatusBarMessageLabel(this); - m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + QWidget *contentsContainer = prepareContentsContainer(); + contentsContainer->setContentsMargins(0, 0, 0, 0); - // initialize zoom slider - m_zoomWidget = new QWidget(this); + // Initialize text label + m_label = new KSqueezedTextLabel(m_text, contentsContainer); + m_label->setTextFormat(Qt::PlainText); + m_label->setTextInteractionFlags(Qt::TextBrowserInteraction | Qt::TextSelectableByKeyboard); // for accessibility but also to allow copy-pasting this text. - m_zoomOut = new QToolButton(m_zoomWidget); - m_zoomOut->setIcon(KIcon("zoom-out")); - m_zoomOut->setAutoRaise(true); + // Initialize zoom slider's explanatory label + m_zoomLabel = new KSqueezedTextLabel(i18nc("Used as a noun, i.e. 'Here is the zoom level:'", "Zoom:"), contentsContainer); - m_zoomSlider = new QSlider(Qt::Horizontal, m_zoomWidget); + // Initialize zoom widget + m_zoomSlider = new QSlider(Qt::Horizontal, contentsContainer); + m_zoomSlider->setAccessibleName(i18n("Zoom")); + m_zoomSlider->setAccessibleDescription(i18nc("Description for zoom-slider (accessibility)", "Sets the size of the file icons.")); m_zoomSlider->setPageStep(1); - - const int min = ZoomLevelInfo::minimumLevel(); - const int max = ZoomLevelInfo::maximumLevel(); - m_zoomSlider->setRange(min, max); - m_zoomSlider->setValue(view->zoomLevel()); - updateZoomSliderToolTip(view->zoomLevel()); - - m_zoomIn = new QToolButton(m_zoomWidget); - m_zoomIn->setIcon(KIcon("zoom-in")); - m_zoomIn->setAutoRaise(true); - - QHBoxLayout* zoomWidgetLayout = new QHBoxLayout(m_zoomWidget); - zoomWidgetLayout->setSpacing(0); - zoomWidgetLayout->setMargin(0); - zoomWidgetLayout->addWidget(m_zoomOut); - zoomWidgetLayout->addWidget(m_zoomSlider); - zoomWidgetLayout->addWidget(m_zoomIn); - - connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int))); - connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int))); - connect(m_view, SIGNAL(zoomLevelChanged(int)), m_zoomSlider, SLOT(setValue(int))); - connect(m_zoomOut, SIGNAL(clicked()), this, SLOT(zoomOut())); - connect(m_zoomIn, SIGNAL(clicked()), this, SLOT(zoomIn())); - - // initialize space information - m_spaceInfo = new StatusBarSpaceInfo(this); - m_spaceInfo->setUrl(m_view->url()); - - // initialize progress information - m_progressText = new QLabel(this); - m_progressText->hide(); - - m_progressBar = new QProgressBar(this); + m_zoomSlider->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel()); + + connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::zoomLevelChanged); + connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::updateZoomSliderToolTip); + connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip); + + // Initialize space information + m_spaceInfo = new StatusBarSpaceInfo(contentsContainer); + connect(m_spaceInfo, &StatusBarSpaceInfo::showMessage, this, &DolphinStatusBar::showMessage); + connect(m_spaceInfo, + &StatusBarSpaceInfo::showInstallationProgress, + this, + [this](const QString ¤tlyRunningTaskTitle, int installationProgressPercent) { + showProgress(currentlyRunningTaskTitle, installationProgressPercent, CancelLoading::Disallowed); + }); + + // Initialize progress information + m_stopButton = new QToolButton(contentsContainer); + m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("process-stop"))); + m_stopButton->setAccessibleName(i18n("Stop")); + m_stopButton->setAutoRaise(true); + m_stopButton->setToolTip(i18nc("@tooltip", "Stop loading")); + m_stopButton->hide(); + connect(m_stopButton, &QToolButton::clicked, this, &DolphinStatusBar::stopPressed); + + m_progressTextLabel = new QLabel(contentsContainer); + m_progressTextLabel->hide(); + + m_progressBar = new QProgressBar(contentsContainer); m_progressBar->hide(); - // initialize sizes - const int fontHeight = QFontMetrics(m_messageLabel->font()).height(); - const int zoomWidgetHeight = m_zoomWidget->minimumSizeHint().height(); - const int contentHeight = qMax(fontHeight, zoomWidgetHeight); - - m_messageLabel->setMinimumTextHeight(contentHeight); - m_spaceInfo->setFixedHeight(contentHeight - 5); - m_progressBar->setFixedSize(200, contentHeight); - m_zoomWidget->setFixedSize(150, contentHeight); - - setExtensionsVisible(true); + m_showProgressBarTimer = new QTimer(this); + m_showProgressBarTimer->setInterval(500); + m_showProgressBarTimer->setSingleShot(true); + connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo); + + // initialize text updater delay timer + m_delayUpdateTimer = new QTimer(this); + m_delayUpdateTimer->setInterval(UpdateDelay); + m_delayUpdateTimer->setSingleShot(true); + connect(m_delayUpdateTimer, &QTimer::timeout, this, &DolphinStatusBar::updateLabelText); + + // Initialize top layout and size policies + const int fontHeight = QFontMetrics(m_label->font()).height(); + const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height(); + const int buttonHeight = m_stopButton->height(); + const int contentHeight = qMax(qMax(fontHeight, zoomSliderHeight), buttonHeight); + + QFontMetrics fontMetrics(m_label->font()); + + m_label->setFixedHeight(contentHeight); + m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 15); + + m_spaceInfo->setFixedHeight(contentHeight); + m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25); + m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + m_progressBar->setFixedHeight(zoomSliderHeight); + m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 20); + + m_topLayout = new QHBoxLayout(contentsContainer); + updateContentsMargins(); + m_topLayout->setSpacing(4); + m_topLayout->addWidget(m_label, 1); + m_topLayout->addWidget(m_zoomLabel); + m_topLayout->addWidget(m_zoomSlider, 1); + m_topLayout->addWidget(m_spaceInfo, 1); + m_topLayout->addWidget(m_stopButton); + m_topLayout->addWidget(m_progressTextLabel); + m_topLayout->addWidget(m_progressBar); + + readSettings(); + setWhatsThis(xi18nc("@info:whatsthis Statusbar", + "This is " + "the Statusbar. It contains three elements " + "by default (left to right):A text field" + " that displays the size of selected items. If only " + "one item is selected the name and type is shown as well." + "A zoom slider that allows you " + "to adjust the size of the icons in the view." + "Space information about the " + "current storage device.")); } DolphinStatusBar::~DolphinStatusBar() { } -void DolphinStatusBar::setMessage(const QString& msg, - Type type) +void DolphinStatusBar::setText(const QString &text) { - int timeout = 1000; // Timeout in milliseconds until default - // messages may overwrite other messages. - - QString message = msg; - if (message.isEmpty()) { - // Show the default text as fallback. An empty text indicates - // a clearing of the information message. - if (m_messageLabel->defaultText().isEmpty()) { - return; - } - message = m_messageLabel->defaultText(); - type = Default; - timeout = 0; - } - - if ((message == m_messageLabel->text()) && (type == m_messageLabel->type())) { - // the message is already shown - return; - } - - const QTime currentTime = QTime::currentTime(); - const bool skipMessage = (type == Default) && - m_messageTimeStamp.isValid() && - (m_messageTimeStamp.msecsTo(currentTime) < timeout); - if (skipMessage) { - // A non-default message is shown just for a very short time. Don't hide - // the message by a default message, so that the user gets the chance to - // read the information. + if (m_text == text) { return; } - m_messageLabel->setMessage(message, type); - if (type != Default) { - m_messageTimeStamp = currentTime; - } + m_textTimestamp = QTime::currentTime(); - const int widthGap = m_messageLabel->widthGap(); - if (widthGap > 0) { - m_progressBar->hide(); - m_progressText->hide(); - } - assureVisibleText(); + m_text = text; + // will update status bar text in 50ms + m_delayUpdateTimer->start(); } -DolphinStatusBar::Type DolphinStatusBar::type() const +QString DolphinStatusBar::text() const { - return m_messageLabel->type(); + return m_text; } -QString DolphinStatusBar::message() const +void DolphinStatusBar::showProgress(const QString ¤tlyRunningTaskTitle, int progressPercent, CancelLoading cancelLoading) { - return m_messageLabel->text(); + m_cancelLoading = cancelLoading; + + // Show a busy indicator if a value < 0 is provided: + m_progressBar->setMaximum((progressPercent < 0) ? 0 : 100); + + progressPercent = qBound(0, progressPercent, 100); + if (!m_progressBar->isVisible()) { + // Show the progress bar delayed: In the case if 100 % are reached within + // a short time, no progress bar will be shown at all. + if (!m_showProgressBarTimer->isActive()) { + m_showProgressBarTimer->start(); + } else { + // The timer is already running. Should we restart it or keep it running? + if (m_progressTextLabel->text() != currentlyRunningTaskTitle || (progressPercent < 100 && progressPercent < m_progress)) { + m_showProgressBarTimer->start(); + } + } + } + m_progress = progressPercent; + + m_progressBar->setValue(m_progress); + if (progressPercent == 100) { + // The end of the progress has been reached. Assure that the progress bar + // gets hidden and the extensions widgets get visible again. + m_showProgressBarTimer->stop(); + updateProgressInfo(); + } + + m_progressTextLabel->setText(currentlyRunningTaskTitle); + updateWidthToContent(); } -void DolphinStatusBar::setProgressText(const QString& text) +QString DolphinStatusBar::progressText() const { - m_progressText->setText(text); + return m_progressTextLabel->text(); } -QString DolphinStatusBar::progressText() const +int DolphinStatusBar::progress() const { - return m_progressText->text(); + return m_progress; } -void DolphinStatusBar::setProgress(int percent) +void DolphinStatusBar::resetToDefaultText() { - // show a busy indicator if a value < 0 is provided: - m_progressBar->setMaximum((percent < 0) ? 0 : 100); + m_text.clear(); - if (percent < 0) { - percent = 0; - } else if (percent > 100) { - percent = 100; + QTime currentTime; + if (currentTime.msecsTo(m_textTimestamp) < UpdateDelay) { + m_delayUpdateTimer->start(); + } else { + updateLabelText(); } +} - m_progress = percent; - if (m_messageLabel->type() == Error) { - // don't update any widget or status bar text if an - // error message is shown - return; - } +void DolphinStatusBar::setDefaultText(const QString &text) +{ + m_defaultText = text; + updateLabelText(); +} - m_progressBar->setValue(m_progress); - if (!m_progressBar->isVisible() || (percent == 100)) { - updateProgressInfo(); - } +QString DolphinStatusBar::defaultText() const +{ + return m_defaultText; +} - const QString& defaultText = m_messageLabel->defaultText(); - const QString msg(m_messageLabel->text()); - if ((percent == 0) && !msg.isEmpty()) { - setMessage(QString(), Default); - } else if ((percent == 100) && (msg != defaultText)) { - setMessage(defaultText, Default); +void DolphinStatusBar::setUrl(const QUrl &url) +{ + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth && m_spaceInfo && m_spaceInfo->url() != url) { + m_spaceInfo->setUrl(url); + Q_EMIT urlChanged(); } } -void DolphinStatusBar::clear() +QUrl DolphinStatusBar::url() const { - setMessage(m_messageLabel->defaultText(), Default); + return m_spaceInfo->url(); } -void DolphinStatusBar::setDefaultText(const QString& text) +void DolphinStatusBar::setZoomLevel(int zoomLevel) { - m_messageLabel->setDefaultText(text); + if (zoomLevel != m_zoomSlider->value()) { + m_zoomSlider->setValue(zoomLevel); + } } -const QString& DolphinStatusBar::defaultText() const +int DolphinStatusBar::zoomLevel() const { - return m_messageLabel->defaultText(); + return m_zoomSlider->value(); } -void DolphinStatusBar::refresh() +void DolphinStatusBar::readSettings() { + updateMode(); setExtensionsVisible(true); - assureVisibleText(); } -void DolphinStatusBar::resizeEvent(QResizeEvent* event) +void DolphinStatusBar::updateSpaceInfo() { - // It is important to hide the widgets before invoking - // QWidget::resizeEvent(), otherwise it is possible that - // the dock widgets are shrinked when having a small - // statusbar width (bug #202147). - m_zoomWidget->hide(); - m_spaceInfo->hide(); - - QWidget::resizeEvent(event); - QMetaObject::invokeMethod(this, "assureVisibleText", Qt::QueuedConnection); + m_spaceInfo->update(); } -void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url) +void DolphinStatusBar::updateWidthToContent() { - m_spaceInfo->setUrl(url); - assureVisibleText(); + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small) { + QStyleOptionSlider opt; + opt.initFrom(this); + opt.orientation = Qt::Vertical; + const QSize labelSize = QFontMetrics(font()).size(Qt::TextSingleLine, m_label->fullText()); + // Make sure minimum height takes clipping into account. + setMinimumHeight(m_label->height() + clippingAmount()); + const int scrollbarWidth = style()->pixelMetric(QStyle::PM_ScrollBarExtent, &opt, this); + // Make sure maximumViewWidth does not go below 0. + const int maximumViewWidth = qMax(0, parentWidget()->width() - scrollbarWidth); + if (m_stopButton->isVisible() || m_progressTextLabel->isVisible() || m_progressBar->isVisible()) { + // Use maximum width when interactable elements are shown, to keep them + // from "jumping around" when user tries to interact with them. + setFixedWidth(maximumViewWidth); + } else { + // Make sure we have room for the text + const int contentWidth = labelSize.width() + QFontMetrics(font()).averageCharWidth() + (clippingAmount() * 2); + setFixedWidth(qMin(contentWidth, maximumViewWidth)); + } + Q_EMIT widthUpdated(); + } else { + setMinimumHeight(0); + setFixedWidth(QWIDGETSIZE_MAX); + Q_EMIT widthUpdated(); + } } -void DolphinStatusBar::setZoomLevel(int zoomLevel) +int DolphinStatusBar::clippingAmount() const { - m_zoomOut->setEnabled(zoomLevel > m_zoomSlider->minimum()); - m_zoomIn->setEnabled(zoomLevel < m_zoomSlider->maximum()); - m_view->setZoomLevel(zoomLevel); - updateZoomSliderToolTip(zoomLevel); + QStyleOption opt; + opt.initFrom(this); + // Add 2 for extra padding due to how QRect coordinates work. + const int val = 2 + style()->pixelMetric(QStyle::PM_SplitterWidth, &opt, this) * 2; + return val; } -void DolphinStatusBar::assureVisibleText() +void DolphinStatusBar::updateMode() { - const int widthGap = m_messageLabel->widthGap(); - if (m_spaceInfo->isVisible() || m_zoomWidget->isVisible()) { - // At least the space information or the zoom slider is shown. - // Hide them if the status bar text does not fit into the available width. - setExtensionsVisible(widthGap <= 0); - } else if (!m_progressBar->isVisible()) { - const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - const int spaceInfoWidth = settings->showSpaceInfo() ? m_spaceInfo->minimumWidth() : 0; - const int zoomWidgetWidth = settings->showZoomSlider() ? m_zoomWidget->minimumWidth() : 0; - const int widgetsWidth = spaceInfoWidth + zoomWidgetWidth; - setExtensionsVisible(widthGap + widgetsWidth <= 0); + switch (GeneralSettings::showStatusBar()) { + case GeneralSettings::EnumShowStatusBar::Small: + setEnabled(true); + m_spaceInfo->setShown(false); + m_zoomSlider->setVisible(false); + m_zoomLabel->setVisible(false); + setVisible(true, WithAnimation); + break; + case GeneralSettings::EnumShowStatusBar::FullWidth: + setEnabled(true); + m_spaceInfo->setShown(true); + setVisible(true, WithAnimation); + break; + case GeneralSettings::EnumShowStatusBar::Disabled: + setEnabled(false); + setVisible(false, WithoutAnimation); + break; } + Q_EMIT modeUpdated(); + updateWidthToContent(); } -void DolphinStatusBar::zoomOut() +void DolphinStatusBar::contextMenuEvent(QContextMenuEvent *event) { - const int value = m_zoomSlider->value(); - m_zoomSlider->setValue(value - 1); -} + Q_UNUSED(event) -void DolphinStatusBar::zoomIn() -{ - const int value = m_zoomSlider->value(); - m_zoomSlider->setValue(value + 1); + // Do not show the context menu on small statusbar. + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small) { + return; + } + + QMenu menu(this); + + QAction *showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); + showZoomSliderAction->setCheckable(true); + showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider()); + + const QAction *action = menu.exec(event->reason() == QContextMenuEvent::Reason::Mouse ? QCursor::pos() : mapToGlobal(QPoint(width() / 2, height() / 2))); + if (action == showZoomSliderAction) { + const bool visible = showZoomSliderAction->isChecked(); + GeneralSettings::setShowZoomSlider(visible); + m_zoomSlider->setVisible(visible); + m_zoomLabel->setVisible(visible); + } + updateContentsMargins(); } void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) @@ -309,40 +375,97 @@ void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) void DolphinStatusBar::updateProgressInfo() { - const bool isErrorShown = (m_messageLabel->type() == Error); if (m_progress < 100) { - // show the progress information and hide the extensions + // Show the progress information and hide the extensions + m_stopButton->setVisible(m_cancelLoading == CancelLoading::Allowed); + m_progressTextLabel->show(); + m_progressBar->show(); setExtensionsVisible(false); - if (!isErrorShown) { - m_progressText->show(); - m_progressBar->show(); - } } else { - // hide the progress information and show the extensions - m_progressText->hide(); + // Hide the progress information and show the extensions + m_stopButton->hide(); + m_progressTextLabel->hide(); m_progressBar->hide(); - assureVisibleText(); + setExtensionsVisible(true); } + updateWidthToContent(); +} + +void DolphinStatusBar::updateLabelText() +{ + const QString text = m_text.isEmpty() ? m_defaultText : m_text; + m_label->setText(text); + updateWidthToContent(); +} + +void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) +{ + const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel); + m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); } void DolphinStatusBar::setExtensionsVisible(bool visible) { - bool spaceInfoVisible = visible; - bool zoomSliderVisible = visible; + bool showZoomSlider = visible; if (visible) { - const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - spaceInfoVisible = settings->showSpaceInfo(); - zoomSliderVisible = settings->showZoomSlider(); + showZoomSlider = GeneralSettings::showZoomSlider() && GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth; } - m_spaceInfo->setVisible(spaceInfoVisible); - m_zoomWidget->setVisible(zoomSliderVisible); + m_zoomSlider->setVisible(showZoomSlider); + m_zoomLabel->setVisible(showZoomSlider); + updateContentsMargins(); } -void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) +void DolphinStatusBar::updateContentsMargins() { - const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel); - m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth) { + // We reduce the outside margin for the flat button so it visually has the same margin as the status bar text label on the other end of the bar. + m_topLayout->setContentsMargins(6, 0, 2, 0); + } else { + // Add extra margins to toplayout to avoid clipping too early. + m_topLayout->setContentsMargins(clippingAmount() * 2, 0, clippingAmount(), 0); + } + setContentsMargins(0, 0, 0, 0); +} + +void DolphinStatusBar::paintEvent(QPaintEvent *paintEvent) +{ + Q_UNUSED(paintEvent) + QPainter p(this); + QStyleOption opt; + opt.initFrom(this); + // Draw statusbar only if there is text. + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small) { + if (m_label && !m_label->fullText().isEmpty()) { + opt.state = QStyle::State_Sunken; + QPainterPath path; + // Adjust the rectangle to be a bit larger, then clip the left and bottom border off. + QRect clipRect; + if (layoutDirection() == Qt::RightToLeft) { + opt.rect = rect().adjusted(0, 0, clippingAmount(), clippingAmount()); + clipRect = QRect(opt.rect.topLeft(), opt.rect.bottomRight()).adjusted(0, 0, -clippingAmount(), -clippingAmount()); + } else { + opt.rect = rect().adjusted(-clippingAmount(), 0, 0, clippingAmount()); + clipRect = QRect(opt.rect.topLeft(), opt.rect.bottomRight()).adjusted(clippingAmount(), 0, 0, -clippingAmount()); + } + path.addRect(clipRect); + p.setClipPath(path); + opt.palette.setColor(QPalette::Base, palette().window().color()); + p.setBrush(palette().window().color()); + p.setPen(Qt::transparent); + p.drawRoundedRect(opt.rect, 5, 5); // Radius is from Breeze style. + style()->drawPrimitive(QStyle::PE_Frame, &opt, &p, this); + } + } + // Draw regular statusbar. + else { + style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this); + } +} + +int DolphinStatusBar::preferredHeight() const +{ + return m_spaceInfo->height(); } -#include "dolphinstatusbar.moc" +#include "moc_dolphinstatusbar.cpp"