diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp index 5e702fd6..1839c58a 100644 --- a/kdecoration/breezedecoration.cpp +++ b/kdecoration/breezedecoration.cpp @@ -335,14 +335,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; @@ -355,9 +355,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; @@ -375,7 +375,7 @@ namespace Breeze { m_internalSettings = SettingsProvider::self()->internalSettings( this ); - + setScaledCornerRadius(); // animation @@ -549,8 +549,9 @@ 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(), m_scaledCornerRadius, m_scaledCornerRadius); - else painter->drawRect( rect() ); + //if( s->isAlphaChannelSupported() ) painter->drawRoundedRect(rect(), m_scaledCornerRadius, m_scaledCornerRadius); + //else + painter->drawRect( rect() ); painter->restore(); } @@ -871,11 +872,11 @@ namespace Breeze m_sizeGrip = nullptr; } } - + void Decoration::setScaledCornerRadius() { m_scaledCornerRadius = Metrics::Frame_FrameRadius*settings()->smallSpacing(); - + } } // namespace