From 915e55a07fe6fe36b2ff1d7501910f736199cd66 Mon Sep 17 00:00:00 2001 From: Jacopo De Simoi Date: Thu, 1 Nov 2018 10:57:05 -0400 Subject: [PATCH] Make decorations tiny and sharp --- kdecoration/breezedecoration.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp index d5526ce2..2c5fa7ed 100644 --- a/kdecoration/breezedecoration.cpp +++ b/kdecoration/breezedecoration.cpp @@ -331,14 +331,14 @@ namespace Breeze //________________________________________________________________ int Decoration::borderSize(bool bottom) const { - const int baseSize = settings()->smallSpacing(); + const int baseSize = settings()->smallSpacing()*0.50; if( m_internalSettings && (m_internalSettings->mask() & BorderSize ) ) { switch (m_internalSettings->borderSize()) { case InternalSettings::BorderNone: return 0; - case InternalSettings::BorderNoSides: return bottom ? qMax(4, baseSize) : 0; + case InternalSettings::BorderNoSides: return bottom ? baseSize : 0; default: - case InternalSettings::BorderTiny: return bottom ? qMax(4, baseSize) : baseSize; + case InternalSettings::BorderTiny: return baseSize; case InternalSettings::BorderNormal: return baseSize*2; case InternalSettings::BorderLarge: return baseSize*3; case InternalSettings::BorderVeryLarge: return baseSize*4; @@ -351,9 +351,9 @@ namespace Breeze switch (settings()->borderSize()) { case KDecoration2::BorderSize::None: return 0; - case KDecoration2::BorderSize::NoSides: return bottom ? qMax(4, baseSize) : 0; + case KDecoration2::BorderSize::NoSides: return bottom ? baseSize : 0; default: - case KDecoration2::BorderSize::Tiny: return bottom ? qMax(4, baseSize) : baseSize; + case KDecoration2::BorderSize::Tiny: return baseSize; case KDecoration2::BorderSize::Normal: return baseSize*2; case KDecoration2::BorderSize::Large: return baseSize*3; case KDecoration2::BorderSize::VeryLarge: return baseSize*4; @@ -533,8 +533,11 @@ namespace Breeze // clip away the top part if( !hideTitleBar() ) painter->setClipRect(0, borderTop(), size().width(), size().height() - borderTop(), Qt::IntersectClip); - if( s->isAlphaChannelSupported() ) painter->drawRoundedRect(rect(), Metrics::Frame_FrameRadius, Metrics::Frame_FrameRadius); - else painter->drawRect( rect() ); + //if( s->isAlphaChannelSupported() ) painter->drawRoundedRect(rect(), Metrics::Frame_FrameRadius/2, Metrics::Frame_FrameRadius/2); + //else + + // // Go sharper; no rounded edges + painter->drawRect( rect() ); painter->restore(); }