Skip to content

Commit

Permalink
Fixed high CPU usage with scale factors (#1931)
Browse files Browse the repository at this point in the history
`KWindowSystem` started to take the scale factor into account; we should also do so in task bar.

NOTE: `KWindowSystem` 5.101.0, which is our minimum required version, does it too.

Fixes #1926
  • Loading branch information
tsujan authored Aug 28, 2023
1 parent 09a6439 commit 7cfb999
Showing 1 changed file with 18 additions and 10 deletions.
28 changes: 18 additions & 10 deletions plugin-taskbar/lxqttaskbutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ void LXQtTaskButton::updateIcon()
************************************************/
void LXQtTaskButton::refreshIconGeometry(QRect const & geom)
{
// NOTE: This function announces where the task icon is,
// such that X11 WMs can perform their related animations correctly.

xcb_connection_t* x11conn = QX11Info::connection();

if (!x11conn) {
Expand All @@ -173,16 +176,21 @@ void LXQtTaskButton::refreshIconGeometry(QRect const & geom)
NET::WMIconGeometry,
NET::Properties2());
NETRect const curr = info.iconGeometry();
if (curr.pos.x != geom.x() || curr.pos.y != geom.y()
|| curr.size.width != geom.width() || curr.size.height != geom.height())
{
NETRect nrect;
nrect.pos.x = geom.x();
nrect.pos.y = geom.y();
nrect.size.height = geom.height();
nrect.size.width = geom.width();
info.setIconGeometry(nrect);
}

// see kwindowsystem -> NETWinInfo::setIconGeometry for the scale factor
const qreal scaleFactor = qApp->devicePixelRatio();
int xPos = geom.x() * scaleFactor;
int yPos = geom.y() * scaleFactor;
int w = geom.width() * scaleFactor;
int h = geom.height() * scaleFactor;
if (xPos == curr.pos.x && yPos == curr.pos.y && w == curr.size.width && h == curr.size.height)
return;
NETRect nrect;
nrect.pos.x = geom.x();
nrect.pos.y = geom.y();
nrect.size.height = geom.height();
nrect.size.width = geom.width();
info.setIconGeometry(nrect);
}

/************************************************
Expand Down

0 comments on commit 7cfb999

Please sign in to comment.