yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop unnecessary emptiness check

Browse source 
If a buffer is attached to the surface, its width or height cannot be 0.
This commit is contained in:
Vlad Zahorodnii 2020-06-10 10:53:36 +03:00 committed by Vlad Zahorodnii
parent 562a57945b
commit 0c8b77edc0
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/wayland/surface_interface.cpp
View file

@ -451,18 +451,16 @@ void SurfaceInterface::Private::swapStates(State *source, State *target, bool em
if (bufferChanged) { if (bufferChanged) {
if (target->buffer && (!target->damage.isEmpty() || !target->bufferDamage.isEmpty())) { if (target->buffer && (!target->damage.isEmpty() || !target->bufferDamage.isEmpty())) {
const QRegion windowRegion = QRegion(0, 0, q->size().width(), q->size().height()); const QRegion windowRegion = QRegion(0, 0, q->size().width(), q->size().height());
if (!windowRegion.isEmpty()) { const QRegion bufferDamage = mapFromBuffer(target, target->bufferDamage);
const QRegion bufferDamage = mapFromBuffer(target, target->bufferDamage); target->damage = windowRegion.intersected(target->damage.united(bufferDamage));
target->damage = windowRegion.intersected(target->damage.united(bufferDamage)); trackedDamage = trackedDamage.united(target->damage);
trackedDamage = trackedDamage.united(target->damage); emit q->damaged(target->damage);
emit q->damaged(target->damage); // workaround for https://bugreports.qt.io/browse/QTBUG-52092
// workaround for https://bugreports.qt.io/browse/QTBUG-52092 // if the surface is a sub-surface, but the main surface is not yet mapped, fake frame rendered
// if the surface is a sub-surface, but the main surface is not yet mapped, fake frame rendered if (subSurface) {
if (subSurface) { const auto mainSurface = subSurface->mainSurface();
const auto mainSurface = subSurface->mainSurface(); if (!mainSurface || !mainSurface->buffer()) {
if (!mainSurface || !mainSurface->buffer()) { q->frameRendered(0);
q->frameRendered(0);
}
} }
} }
} }