Make decorations tiny and sharp

wilder-5.17
Jacopo De Simoi 7 years ago
parent ae205bd3a6
commit 915e55a07f
  1. 17
      kdecoration/breezedecoration.cpp

@ -331,14 +331,14 @@ namespace Breeze
//________________________________________________________________ //________________________________________________________________
int Decoration::borderSize(bool bottom) const 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 ) ) if( m_internalSettings && (m_internalSettings->mask() & BorderSize ) )
{ {
switch (m_internalSettings->borderSize()) { switch (m_internalSettings->borderSize()) {
case InternalSettings::BorderNone: return 0; case InternalSettings::BorderNone: return 0;
case InternalSettings::BorderNoSides: return bottom ? qMax(4, baseSize) : 0; case InternalSettings::BorderNoSides: return bottom ? baseSize : 0;
default: default:
case InternalSettings::BorderTiny: return bottom ? qMax(4, baseSize) : baseSize; case InternalSettings::BorderTiny: return baseSize;
case InternalSettings::BorderNormal: return baseSize*2; case InternalSettings::BorderNormal: return baseSize*2;
case InternalSettings::BorderLarge: return baseSize*3; case InternalSettings::BorderLarge: return baseSize*3;
case InternalSettings::BorderVeryLarge: return baseSize*4; case InternalSettings::BorderVeryLarge: return baseSize*4;
@ -351,9 +351,9 @@ namespace Breeze
switch (settings()->borderSize()) { switch (settings()->borderSize()) {
case KDecoration2::BorderSize::None: return 0; 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: 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::Normal: return baseSize*2;
case KDecoration2::BorderSize::Large: return baseSize*3; case KDecoration2::BorderSize::Large: return baseSize*3;
case KDecoration2::BorderSize::VeryLarge: return baseSize*4; case KDecoration2::BorderSize::VeryLarge: return baseSize*4;
@ -533,8 +533,11 @@ namespace Breeze
// clip away the top part // clip away the top part
if( !hideTitleBar() ) painter->setClipRect(0, borderTop(), size().width(), size().height() - borderTop(), Qt::IntersectClip); 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); //if( s->isAlphaChannelSupported() ) painter->drawRoundedRect(rect(), Metrics::Frame_FrameRadius/2, Metrics::Frame_FrameRadius/2);
else painter->drawRect( rect() ); //else
// // Go sharper; no rounded edges
painter->drawRect( rect() );
painter->restore(); painter->restore();
} }

Loading…
Cancel
Save