Compare commits

..

9 Commits

Author SHA1 Message Date
Jacopo De Simoi a50d19e80c Make sizegrip larger 8 years ago
Jacopo De Simoi 9e47fa5c9d Make decoration of size 1px again 8 years ago
Jacopo De Simoi 7abcb51348 Size grip is back 8 years ago
Jacopo De Simoi bb3727e936 Merge conflicts by hand 8 years ago
Jacopo De Simoi 67b6926d14 Revert "add a frame with the shadows" 8 years ago
Jacopo De Simoi 7bf86a6e2d Add red border sizegrip 8 years ago
Jacopo De Simoi 97b77837af Add solarized cursors 8 years ago
Jacopo De Simoi 95c1f8d472 add a frame with the shadows 8 years ago
Jacopo De Simoi 3d8d5ffa5f remove shadow offset 8 years ago
  1. 13
      kdecoration/breezedecoration.cpp
  2. 1
      kstyle/breezestyle.cpp

@ -106,10 +106,7 @@ namespace Breeze
{ {
auto c = client().data(); auto c = client().data();
// Always return the title bar color regardless of wheter or // if( hideTitleBar() ) return c->color( ColorGroup::Inactive, ColorRole::TitleBar );
// not the title bar is visible or not.
// if( hideTitleBar() ) return c->color( ColorGroup::Inactive, ColorRole::TitleBar );
//else //else
// if( m_animation->state() == QPropertyAnimation::Running ) // if( m_animation->state() == QPropertyAnimation::Running )
// { // {
@ -244,9 +241,6 @@ namespace Breeze
void Decoration::updateSizeGripVisibility() void Decoration::updateSizeGripVisibility()
{ {
auto c = client().data(); auto c = client().data();
// I am stealing the sizeGrip to indicate that the window is
// active, so it should be visible provided that the client is
// active.
if( m_sizeGrip ) if( m_sizeGrip )
{ m_sizeGrip->setVisible( c->isActive() && !c->isShaded() ); } { m_sizeGrip->setVisible( c->isActive() && !c->isShaded() ); }
} }
@ -465,8 +459,7 @@ namespace Breeze
if (c->isActive()) { if (c->isActive()) {
painter->setPen( c->color( ColorGroup::Active, ColorRole::TitleBar ) ); painter->setPen( c->color( ColorGroup::Active, ColorRole::TitleBar ) );
QPointF p=rect().bottomRight()+QPointF(0.5, 0.5); QPointF p=rect().bottomRight()+QPointF(0.5, 0.5);
// Unfortunately SizeGrip::GripSize is private const int sizeGripSize = 18; //this sucks
const int sizeGripSize = 18; //SizeGrip::GripSize;
QPointF q=p-QPoint(0, sizeGripSize); QPointF q=p-QPoint(0, sizeGripSize);
QPointF r=p-QPoint(sizeGripSize, 0); QPointF r=p-QPoint(sizeGripSize, 0);
painter->drawLine( p, q ); painter->drawLine( p, q );
@ -713,9 +706,9 @@ namespace Breeze
// contrast pixel // contrast pixel
QRectF innerRect = QRectF( QRectF innerRect = QRectF(
shadowSize - Metrics::Shadow_Overlap, shadowSize - shadowOffset - Metrics::Shadow_Overlap, shadowSize - Metrics::Shadow_Overlap, shadowSize - shadowOffset - Metrics::Shadow_Overlap,
2*Metrics::Shadow_Overlap, shadowOffset + 2*Metrics::Shadow_Overlap ); 2*Metrics::Shadow_Overlap, shadowOffset + 2*Metrics::Shadow_Overlap );
painter.setPen( gradientStopColor( g_shadowColor, (g_shadowSizeEnum == InternalSettings::ShadowNone) ? g_shadowStrength:(g_shadowStrength*0.5) ) ); painter.setPen( gradientStopColor( g_shadowColor, (g_shadowSizeEnum == InternalSettings::ShadowNone) ? g_shadowStrength:(g_shadowStrength*0.5) ) );
painter.setBrush( Qt::NoBrush ); painter.setBrush( Qt::NoBrush );
painter.drawRoundedRect( innerRect, -0.5 + Metrics::Frame_FrameRadius, -0.5 + Metrics::Frame_FrameRadius ); painter.drawRoundedRect( innerRect, -0.5 + Metrics::Frame_FrameRadius, -0.5 + Metrics::Frame_FrameRadius );

@ -5659,7 +5659,6 @@ namespace Breeze
color = (documentMode&&!isQtQuickControl&&!hasAlteredBackground(widget)) ? palette.color( QPalette::Window ) : _helper->frameBackgroundColor( palette ); color = (documentMode&&!isQtQuickControl&&!hasAlteredBackground(widget)) ? palette.color( QPalette::Window ) : _helper->frameBackgroundColor( palette );
} else { } else {
const auto normal( _helper->alphaColor( palette.color( QPalette::Shadow ), 0.2 ) ); const auto normal( _helper->alphaColor( palette.color( QPalette::Shadow ), 0.2 ) );
const auto hover( _helper->alphaColor( _helper->hoverColor( palette ), 0.2 ) ); const auto hover( _helper->alphaColor( _helper->hoverColor( palette ), 0.2 ) );
if( animated ) color = KColorUtils::mix( normal, hover, opacity ); if( animated ) color = KColorUtils::mix( normal, hover, opacity );

Loading…
Cancel
Save