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

Simplify code that emits mapped() and unmapped()

Browse source
This commit is contained in:
Vlad Zahorodnii 2020-05-24 18:27:38 +03:00
parent 6bdd20d47b
commit 238f59365f
1 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/wayland/surface_interface.cpp
View file

@ -318,7 +318,7 @@ void SurfaceInterface::Private::destroy()
void SurfaceInterface::Private::swapStates(State *source, State *target, bool emitChanged) void SurfaceInterface::Private::swapStates(State *source, State *target, bool emitChanged)
{ {
Q_Q(SurfaceInterface); Q_Q(SurfaceInterface);
bool bufferChanged = source->bufferIsSet; const bool bufferChanged = source->bufferIsSet;
const bool opaqueRegionChanged = source->opaqueIsSet; const bool opaqueRegionChanged = source->opaqueIsSet;
const bool inputRegionChanged = source->inputIsSet; const bool inputRegionChanged = source->inputIsSet;
const bool scaleFactorChanged = source->scaleIsSet && (target->scale != source->scale); const bool scaleFactorChanged = source->scaleIsSet && (target->scale != source->scale);
@ -352,10 +352,6 @@ void SurfaceInterface::Private::swapStates(State *source, State *target, bool em
const QSize newSize = source->buffer->size(); const QSize newSize = source->buffer->size();
sizeChanged = newSize.isValid() && newSize != oldSize; sizeChanged = newSize.isValid() && newSize != oldSize;
} }
if (!target->buffer && !source->buffer && emitChanged) {
// null buffer set on a not mapped surface, don't emit unmapped
bufferChanged = false;
}
buffer = source->buffer; buffer = source->buffer;
} }
// copy values // copy values
@ -414,6 +410,10 @@ void SurfaceInterface::Private::swapStates(State *source, State *target, bool em
*source = State{}; *source = State{};
source->children = target->children; source->children = target->children;
if (!emitChanged) {
return;
}
if (opaqueRegionChanged) { if (opaqueRegionChanged) {
emit q->opaqueChanged(target->opaque); emit q->opaqueChanged(target->opaque);
} }
@ -429,7 +429,16 @@ void SurfaceInterface::Private::swapStates(State *source, State *target, bool em
if (transformChanged) { if (transformChanged) {
emit q->transformChanged(target->transform); emit q->transformChanged(target->transform);
} }
if (bufferChanged && emitChanged) { if (visibilityChanged) {
if (target->buffer) {
subSurfaceIsMapped = true;
emit q->mapped();
} else {
subSurfaceIsMapped = false;
emit q->unmapped();
}
}
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()) { if (!windowRegion.isEmpty()) {
@ -456,11 +465,6 @@ void SurfaceInterface::Private::swapStates(State *source, State *target, bool em
} }
} }
target->damage = windowRegion.intersected(target->damage.united(bufferDamage)); target->damage = windowRegion.intersected(target->damage.united(bufferDamage));
if (emitChanged) {
subSurfaceIsMapped = true;
if (visibilityChanged) {
emit q->mapped();
}
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
@ -473,13 +477,6 @@ void SurfaceInterface::Private::swapStates(State *source, State *target, bool em
} }
} }
} }
} else if (!target->buffer && emitChanged) {
subSurfaceIsMapped = false;
emit q->unmapped();
}
}
if (!emitChanged) {
return;
} }
if (sizeChanged) { if (sizeChanged) {
emit q->sizeChanged(); emit q->sizeChanged();