From b09746db12ceb16795cfff79d316e3ba8ba0218c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 23 Apr 2024 07:04:05 +0300 Subject: [PATCH] kdeplasma-addons: tweak the kolourpicker applet layout Signed-off-by: Ivailo Monev --- kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp b/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp index f9774394..caec4601 100644 --- a/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp +++ b/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp @@ -225,7 +225,6 @@ Kolourpicker::Kolourpicker(QObject *parent, const QVariantList &args) QGraphicsLinearLayout *mainlay = new QGraphicsLinearLayout(Qt::Vertical); setLayout(mainlay); mainlay->setSpacing(4); - mainlay->setContentsMargins(0.0, 0.0, 0.0, 0.0); m_grabWidget = new QWidget( 0, Qt::X11BypassWindowManagerHint ); m_grabWidget->move( -1000, -1000 ); @@ -274,7 +273,7 @@ Kolourpicker::Kolourpicker(QObject *parent, const QVariantList &args) void Kolourpicker::setDefaultColorFormat(QAction *act) { if (!act) { - return; + return; } m_color_format = qvariant_cast(act->data()); @@ -343,7 +342,8 @@ void Kolourpicker::constraintsEvent(Plasma::Constraints constraints) const QSizeF contentsrect = contentsRect().size(); const qreal iconsizereal = qMin(contentsrect.width(), contentsrect.height()); const QSizeF iconsizef = QSizeF(iconsizereal, iconsizereal); - const QSize contentsiconsize = QSize(iconsizereal - s_margin, iconsizereal- s_margin); + static const int marginx2 = (s_margin * 2); + const QSize contentsiconsize = QSize(iconsizereal - marginx2, iconsizereal - marginx2); m_configAndHistory->setPreferredSize(iconsizef); m_configAndHistory->nativeWidget()->setIconSize(contentsiconsize); m_grabButton->setPreferredSize(iconsizef);