X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a27443d904bc220615f2c4e8df74187b0c806d8a..dd07a327:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index d9ed1076e..4d76afcbe 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -285,7 +285,8 @@ void DolphinStatusBar::updateWidthToContent() // Make sure minimum height takes clipping into account. setMinimumHeight(m_label->height() + clippingAmount()); const int scrollbarWidth = style()->pixelMetric(QStyle::PM_ScrollBarExtent, &opt, this); - const int maximumViewWidth = parentWidget()->width() - scrollbarWidth; + // 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. @@ -339,6 +340,11 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent *event) { Q_UNUSED(event) + // 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"));