Skip to content

Add new feature + fix compile error and depreciations warning #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kay0u wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add new feature + fix compile error and depreciations warning #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8bd5605
Add a a new tab to manage the buttons color
kay0u Oct 2, 2020
3481638
fix compile issue with Qt5.15
kay0u Oct 2, 2020
cfe1261
Remove some deprecations warning
kay0u Oct 2, 2020
cd8316a
cleanup breezebutton
kay0u Oct 2, 2020
c2776ee
Icon inside KeepBelow button is now the same as KeepAbove, but flipped
kay0u Oct 2, 2020
3512961
Port away from KWin plugin loading using keyword which has been removed
alex1701c Jun 5, 2022
2469bb6
Merge pull request #1 from alex1701c/master
kay0u Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 78 additions & 81 deletions breezebutton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <KColorUtils>

#include <QPainter>
#include <QPainterPath>

namespace SierraBreeze
{
Expand Down Expand Up @@ -54,7 +55,7 @@ namespace SierraBreeze
setIconSize(QSize( height, height ));

// connections
connect(decoration->client().data(), SIGNAL(iconChanged(QIcon)), this, SLOT(update()));
connect(decoration->client().toStrongRef().data(), SIGNAL(iconChanged(QIcon)), this, SLOT(update()));
connect(decoration->settings().data(), &KDecoration2::DecorationSettings::reconfigured, this, &Button::reconfigure);
connect( this, &KDecoration2::DecorationButton::hoveredChanged, this, &Button::updateAnimationState );

Expand Down Expand Up @@ -86,32 +87,32 @@ namespace SierraBreeze
{

case DecorationButtonType::Close:
b->setVisible( d->client().data()->isCloseable() );
QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::closeableChanged, b, &SierraBreeze::Button::setVisible );
b->setVisible( d->client().toStrongRef().data()->isCloseable() );
QObject::connect(d->client().toStrongRef().data(), &KDecoration2::DecoratedClient::closeableChanged, b, &SierraBreeze::Button::setVisible );
break;

case DecorationButtonType::Maximize:
b->setVisible( d->client().data()->isMaximizeable() );
QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::maximizeableChanged, b, &SierraBreeze::Button::setVisible );
b->setVisible( d->client().toStrongRef().data()->isMaximizeable() );
QObject::connect(d->client().toStrongRef().data(), &KDecoration2::DecoratedClient::maximizeableChanged, b, &SierraBreeze::Button::setVisible );
break;

case DecorationButtonType::Minimize:
b->setVisible( d->client().data()->isMinimizeable() );
QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::minimizeableChanged, b, &SierraBreeze::Button::setVisible );
b->setVisible( d->client().toStrongRef().data()->isMinimizeable() );
QObject::connect(d->client().toStrongRef().data(), &KDecoration2::DecoratedClient::minimizeableChanged, b, &SierraBreeze::Button::setVisible );
break;

case DecorationButtonType::ContextHelp:
b->setVisible( d->client().data()->providesContextHelp() );
QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::providesContextHelpChanged, b, &SierraBreeze::Button::setVisible );
b->setVisible( d->client().toStrongRef().data()->providesContextHelp() );
QObject::connect(d->client().toStrongRef().data(), &KDecoration2::DecoratedClient::providesContextHelpChanged, b, &SierraBreeze::Button::setVisible );
break;

case DecorationButtonType::Shade:
b->setVisible( d->client().data()->isShadeable() );
QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::shadeableChanged, b, &SierraBreeze::Button::setVisible );
b->setVisible( d->client().toStrongRef().data()->isShadeable() );
QObject::connect(d->client().toStrongRef().data(), &KDecoration2::DecoratedClient::shadeableChanged, b, &SierraBreeze::Button::setVisible );
break;

case DecorationButtonType::Menu:
QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::iconChanged, b, [b]() { b->update(); });
QObject::connect(d->client().toStrongRef().data(), &KDecoration2::DecoratedClient::iconChanged, b, [b]() { b->update(); });
break;

default: break;
Expand Down Expand Up @@ -145,7 +146,7 @@ namespace SierraBreeze
{

const QRectF iconRect( geometry().topLeft(), m_iconSize );
const QPixmap pixmap = decoration()->client().data()->icon().pixmap( m_iconSize );
const QPixmap pixmap = decoration()->client().toStrongRef().data()->icon().pixmap( m_iconSize );
painter->drawPixmap(iconRect.center() - QPoint(pixmap.width()/2, pixmap.height()/2)/pixmap.devicePixelRatio(), pixmap);

} else {
Expand Down Expand Up @@ -198,7 +199,7 @@ namespace SierraBreeze
painter->setPen( pen );
painter->setBrush( Qt::NoBrush );
auto d = qobject_cast<Decoration*>( decoration() );
auto c = d->client().data();
auto c = d->client().toStrongRef().data();

const auto hover_hint_color = QColor(41, 43, 50, 200);
QPen hint_pen(hover_hint_color);
Expand All @@ -211,9 +212,7 @@ namespace SierraBreeze

case DecorationButtonType::Close:
{
QColor button_color = QColor(230, 61, 110);
if (!c->isActive())
button_color = QColor(255, 74, 130);
QColor button_color = QColor(c->isActive() ? active_color : inactive_color);
painter->setBrush( button_color );
painter->setPen( Qt::NoPen );
painter->drawEllipse( QRectF( 0, 0, 18, 18 ) );
Expand All @@ -233,10 +232,7 @@ namespace SierraBreeze

case DecorationButtonType::Maximize:
{
QColor button_color = QColor(60, 120, 255);
if (!c->isActive())
button_color = QColor(61, 155, 255);

QColor button_color = QColor(c->isActive() ? active_color : inactive_color);
painter->setBrush( button_color );
painter->setPen( Qt::NoPen );
// painter->drawEllipse( QRectF( 3, 3, 12, 12 ) );
Expand All @@ -259,32 +255,12 @@ namespace SierraBreeze
painter->fillPath(path1, QBrush(hover_hint_color));
painter->fillPath(path2, QBrush(hover_hint_color));
}
painter->setPen( pen );
// if( isChecked() )
// {
// pen.setJoinStyle( Qt::RoundJoin );
// painter->setPen( pen );

// painter->drawPolygon( QPolygonF()
// << QPointF( 4, 9 )
// << QPointF( 9, 4 )
// << QPointF( 14, 9 )
// << QPointF( 9, 14 ) );

// } else {
// painter->drawPolyline( QPolygonF()
// << QPointF( 4, 11 )
// << QPointF( 9, 6 )
// << QPointF( 14, 11 ) );
// }
break;
}

case DecorationButtonType::Minimize:
{
QColor button_color = QColor(25, 192, 201);
if (!c->isActive())
button_color = QColor(25, 202, 211);
QColor button_color = QColor(c->isActive() ? active_color : inactive_color);
painter->setBrush( button_color );
painter->setPen( Qt::NoPen );
// painter->drawEllipse( QRectF( 3, 3, 12, 12 ) );
Expand All @@ -296,15 +272,12 @@ namespace SierraBreeze
// painter->drawLine( QPointF( 6, 9 ), QPointF( 12, 9 ) );
painter->drawLine( QPointF( 5, 9 ), QPointF( 13, 9 ) );
}
painter->setPen( pen );
break;
}

case DecorationButtonType::OnAllDesktops:
{
QColor button_color = QColor(125, 209, 200);
if (!c->isActive())
button_color = QColor(199, 199, 199);
QColor button_color = QColor(c->isActive() ? active_color : inactive_color);
painter->setBrush( button_color );
painter->setPen( Qt::NoPen );
painter->drawEllipse( QRectF( 0, 0, 18, 18 ) );
Expand All @@ -313,16 +286,12 @@ namespace SierraBreeze
painter->setBrush(QBrush(hover_hint_color));
painter->drawEllipse( QRectF( 6, 6, 6, 6 ) );
}
painter->setPen( pen );
painter->setBrush( Qt::NoBrush );
break;
}

case DecorationButtonType::Shade:
{
QColor button_color = QColor(135, 206, 249);
if (!c->isActive())
button_color = QColor(199, 199, 199);
QColor button_color = QColor(c->isActive() ? active_color : inactive_color);
painter->setBrush( button_color );
painter->setPen( Qt::NoPen );
painter->setBrush( button_color );
Expand All @@ -346,16 +315,13 @@ namespace SierraBreeze
<< QPointF( 9, 8 )
<< QPointF( 14, 13 ) );
}

break;

}

case DecorationButtonType::KeepBelow:
{
QColor button_color = QColor(255, 137, 241);
if (!c->isActive())
button_color = QColor(199, 199, 199);
QColor button_color = QColor(c->isActive() ? active_color : inactive_color);
painter->setBrush( button_color );
painter->setPen( Qt::NoPen );
painter->setBrush( button_color );
Expand All @@ -364,50 +330,32 @@ namespace SierraBreeze
if (isChecked() || isHovered())
{
painter->setPen( hint_pen );
painter->drawPolyline( QPolygonF()
<< QPointF( 4, 5 )
<< QPointF( 9, 10 )
<< QPointF( 14, 5 ) );

painter->drawPolyline( QPolygonF()
<< QPointF( 4, 9 )
<< QPointF( 9, 14 )
<< QPointF( 14, 9 ) );
QPainterPath path;
path.moveTo(9, 12);
path.lineTo(5, 6);
path.lineTo(13, 6);
painter->fillPath(path, QBrush(hover_hint_color));
}

break;

}

case DecorationButtonType::KeepAbove:
{
QColor button_color = QColor(204, 176, 213);
if (!c->isActive())
button_color = QColor(199, 199, 199);
QColor button_color = QColor(c->isActive() ? active_color : inactive_color);
painter->setBrush( button_color );
painter->setPen( Qt::NoPen );
painter->drawEllipse( QRectF( 0, 0, 18, 18 ) );
painter->setBrush( Qt::NoBrush );
if ( isHovered() || isChecked())
{

painter->setPen( hint_pen );
QPainterPath path;
path.moveTo(9, 6);
path.lineTo(5, 12);
path.lineTo(13, 12);
painter->fillPath(path, QBrush(hover_hint_color));
}
painter->setPen( pen );
// painter->drawPolyline( QPolygonF()
// << QPointF( 4, 9 )
// << QPointF( 9, 4 )
// << QPointF( 14, 9 ) );

// painter->drawPolyline( QPolygonF()
// << QPointF( 4, 13 )
// << QPointF( 9, 8 )
// << QPointF( 14, 13 ) );
break;
}

Expand Down Expand Up @@ -487,7 +435,7 @@ namespace SierraBreeze

}

auto c = d->client().data();
auto c = d->client().toStrongRef().data();
if( isPressed() ) {

if( type() == DecorationButtonType::Close ) return c->color( ColorGroup::Warning, ColorRole::Foreground );
Expand Down Expand Up @@ -545,7 +493,56 @@ namespace SierraBreeze

// animation
auto d = qobject_cast<Decoration*>(decoration());
if( d ) m_animation->setDuration( d->internalSettings()->animationsDuration() );
if( d )
{
m_animation->setDuration( d->internalSettings()->animationsDuration() );
switch (type())
{
case DecorationButtonType::Close:
{
active_color = d->internalSettings()->buttonCloseActiveColor();
inactive_color = d->internalSettings()->buttonCloseInactiveColor();
break;
}
case DecorationButtonType::Maximize:
{
active_color = d->internalSettings()->buttonMaximizeActiveColor();
inactive_color = d->internalSettings()->buttonMaximizeInactiveColor();
break;
}
case DecorationButtonType::Minimize:
{
active_color = d->internalSettings()->buttonMinimizeActiveColor();
inactive_color = d->internalSettings()->buttonMinimizeInactiveColor();
break;
}
case DecorationButtonType::OnAllDesktops:
{
active_color = d->internalSettings()->buttonOnAllDesktopsActiveColor();
inactive_color = d->internalSettings()->buttonOnAllDesktopsInactiveColor();
break;
}
case DecorationButtonType::Shade:
{
active_color = d->internalSettings()->buttonShadeActiveColor();
inactive_color = d->internalSettings()->buttonShadeInactiveColor();
break;
}
case DecorationButtonType::KeepBelow:
{
active_color = d->internalSettings()->buttonKeepBelowActiveColor();
inactive_color = d->internalSettings()->buttonKeepBelowInactiveColor();
break;
}
case DecorationButtonType::KeepAbove:
{
active_color = d->internalSettings()->buttonKeepAboveActiveColor();
inactive_color = d->internalSettings()->buttonKeepAboveInactiveColor();
break;
}
default: break;
}
}

}

Expand Down
3 changes: 3 additions & 0 deletions breezebutton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ namespace SierraBreeze

//* active state change opacity
qreal m_opacity = 0;

QColor active_color;
QColor inactive_color;
};

} // namespace
Expand Down
Loading