Differential D18486 Diff 50179 plugins/scenes/qpainter/scene_qpainter.cpp

Changeset View

Standalone View

View Options

plugins/scenes/qpainter/scene_qpainter.cpp

Show First 20 Lines • Show All 266 Lines • ▼ Show 20 Line(s)263 if (!opaque) {
267 tempPainter.begin(&tempImage); 267​ tempPainter.begin(&tempImage);
268 tempPainter.save(); 268​ tempPainter.save();
269 tempPainter.translate(toplevel->geometry().topLeft() - toplevel->visibleRect().topLeft()); 269​ tempPainter.translate(toplevel->geometry().topLeft() - toplevel->visibleRect().topLeft());
270 painter = &tempPainter; 270​ painter = &tempPainter;
271 } 271​ }
272 renderShadow(painter); 272​ renderShadow(painter);
273 renderWindowDecorations(painter); 273​ renderWindowDecorations(painter);
274 274​
275​
275 // render content 276​ // render content
276 const QRect target = QRect(toplevel->clientPos(), toplevel->clientSize()); 277​ const QRect target = QRect(toplevel->clientPos(), toplevel->clientSize());
277 QSize srcSize = pixmap->image().size(); 278​
278 if (pixmap->surface() && pixmap->surface()->scale() == 1 && srcSize != toplevel->clientSize()) { 279​ QRect src;
280​ if (qobject_cast<Client*>(toplevel)) {
279 // special case for XWayland windows 281​ // special case for XWayland windows
280 srcSize = toplevel->clientSize(); 282​ const auto scale = pixmap->surface()->scale();
283​ src = QRect((toplevel->clientPos() + toplevel->clientContentPos()) * scale, toplevel->clientSize() * scale);
284​ painter->setRenderHint(QPainter::SmoothPixmapTransform);
davidedmundsonUnsubmitted
Not Done

I would expect one of the QPainter::setRenderHints will fix this.

davidedmundson: I would expect one of the QPainter::setRenderHints will fix this.
romanggAuthorUnsubmitted
Not Done

You expected correctly. :)

The Antialising one didn't help, but SmoothPixmapTransform did.

romangg: You expected correctly. :) The Antialising one didn't help, but SmoothPixmapTransform did.
davidedmundsonUnsubmitted
Not Done

Cool, that's relevant with just wayland scaling so you can ship a line adding that in a separate patch and I'll approve.

davidedmundson: Cool, that's relevant with just wayland scaling so you can ship a line adding that in a…
davidedmundsonUnsubmitted
Not Done

I think we can just do this once at the start of the scene paint.

If pixmap sizes match it won't have any performance impact - and I think it should still be relevant for wayland on wayland if the client scale doesn't match the output scale.

davidedmundson: I think we can just do this once at the start of the scene paint. If pixmap sizes match it…
285​ } else {
286​ src = QRect(toplevel->clientPos() + toplevel->clientContentPos(), pixmap->image().size());
281 } 287​ }
282 const QRect src = QRect(toplevel->clientPos() + toplevel->clientContentPos(), srcSize); 288​
283 painter->drawImage(target, pixmap->image(), src); 289​ painter->drawImage(target, pixmap->image(), src);
284 290​
285 // render subsurfaces 291​ // render subsurfaces
286 const auto &children = pixmap->children(); 292​ const auto &children = pixmap->children();
287 for (auto pixmap : children) { 293​ for (auto pixmap : children) {
288 if (pixmap->subSurface().isNull() || pixmap->subSurface()->surface().isNull() || !pixmap->subSurface()->surface()->isMapped()) { 294​ if (pixmap->subSurface().isNull() || pixmap->subSurface()->surface().isNull() || !pixmap->subSurface()->surface()->isMapped()) {
289 continue; 295​ continue;
290 } 296​ }
▲ Show 20 Lines • Show All 586 Lines • Show Last 20 Lines