|
|
|
|
@ -328,14 +328,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; |
|
|
|
|
@ -348,9 +348,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; |
|
|
|
|
@ -534,8 +534,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(); |
|
|
|
|
} |
|
|
|
|
|