1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-07 10:51:45 +00:00

Adapt to frame change in Breeze

Reduce margins in some places, make the dolphinstatusbar use a
QStatusBar style, and mark the kitemlistcontainer as no frame
This commit is contained in:
Carl Schwan 2023-08-23 00:03:18 +02:00
parent 96c602605d
commit 659eafd796
4 changed files with 15 additions and 2 deletions

View File

@ -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

View File

@ -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);

View File

@ -19,8 +19,10 @@
#include <QHelpEvent>
#include <QIcon>
#include <QMenu>
#include <QPainter>
#include <QProgressBar>
#include <QSlider>
#include <QStyleOption>
#include <QTimer>
#include <QToolButton>
@ -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"

View File

@ -94,6 +94,7 @@ Q_SIGNALS:
protected:
void contextMenuEvent(QContextMenuEvent *event) override;
void paintEvent(QPaintEvent *paintEvent) override;
private Q_SLOTS:
void showZoomSliderToolTip(int zoomLevel);