diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index 84902eb9c..e6e9b744a 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -33,8 +33,7 @@ public: QSize minimumSizeHint() const override { - const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin); - return QSize(border, border); + return QSize(0, 0); } QSize sizeHint() const override diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 635121062..ccdd7fcc5 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -2139,6 +2139,7 @@ void DolphinMainWindow::setupDockWidgets() DolphinDockWidget *terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); terminalDock->setLocked(lock); terminalDock->setObjectName(QStringLiteral("terminalDock")); + terminalDock->setContentsMargins(0, 0, 0, 0); m_terminalPanel = new TerminalPanel(terminalDock); m_terminalPanel->setCustomContextMenuActions({lockLayoutAction}); terminalDock->setWidget(m_terminalPanel); diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 9830960dc..9451566fd 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -19,8 +19,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -44,6 +46,8 @@ DolphinStatusBar::DolphinStatusBar(QWidget *parent) , m_delayUpdateTimer(nullptr) , m_textTimestamp() { + setContentsMargins(4, 0, 4, 0); + // Initialize text label m_label = new KSqueezedTextLabel(m_text, this); m_label->setWordWrap(true); @@ -336,4 +340,12 @@ void DolphinStatusBar::setExtensionsVisible(bool visible) m_zoomLabel->setVisible(showZoomSlider); } +void DolphinStatusBar::paintEvent(QPaintEvent *paintEvent) +{ + QPainter p(this); + QStyleOption opt; + opt.initFrom(this); + style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this); +} + #include "moc_dolphinstatusbar.cpp" diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h index c3773d438..983f5b6da 100644 --- a/src/statusbar/dolphinstatusbar.h +++ b/src/statusbar/dolphinstatusbar.h @@ -94,6 +94,7 @@ Q_SIGNALS: protected: void contextMenuEvent(QContextMenuEvent *event) override; + void paintEvent(QPaintEvent *paintEvent) override; private Q_SLOTS: void showZoomSliderToolTip(int zoomLevel);