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

Revert "wayland: Property propagate modifier SurfaceState fields"

Browse source 
This reverts commit a101bc3628.
This commit is contained in:
Vlad Zahorodnii 2023-09-10 14:52:06 +03:00
parent 41e5409b23
commit 305847625f
1 changed files with 26 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/wayland/surface_interface.cpp
View file

@ -542,75 +542,65 @@ void SurfaceState::mergeInto(SurfaceState *target)
target->serial = serial; target->serial = serial;
target->locks = locks; target->locks = locks;
target->bufferIsSet = bufferIsSet; if (bufferIsSet) {
if (target->bufferIsSet) {
target->buffer = buffer; target->buffer = buffer;
target->offset = offset; target->offset = offset;
target->damage = damage; target->damage = damage;
target->bufferDamage = bufferDamage; target->bufferDamage = bufferDamage;
target->bufferIsSet = true;
} }
if (viewport.sourceGeometryIsSet) {
target->viewport.sourceGeometryIsSet = viewport.sourceGeometryIsSet;
if (target->viewport.sourceGeometryIsSet) {
target->viewport.sourceGeometry = viewport.sourceGeometry; target->viewport.sourceGeometry = viewport.sourceGeometry;
target->viewport.sourceGeometryIsSet = true;
} }
if (viewport.destinationSizeIsSet) {
target->viewport.destinationSizeIsSet = viewport.destinationSizeIsSet;
if (target->viewport.destinationSizeIsSet) {
target->viewport.destinationSize = viewport.destinationSize; target->viewport.destinationSize = viewport.destinationSize;
target->viewport.destinationSizeIsSet = true;
} }
target->subsurfaceOrderChanged = subsurfaceOrderChanged; if (subsurfaceOrderChanged) {
if (target->subsurfaceOrderChanged) {
target->subsurface.below = subsurface.below; target->subsurface.below = subsurface.below;
target->subsurface.above = subsurface.above; target->subsurface.above = subsurface.above;
target->subsurfaceOrderChanged = true;
} }
if (subsurfacePositionChanged) {
target->subsurfacePositionChanged = subsurfacePositionChanged;
if (target->subsurfacePositionChanged) {
target->subsurface.position = subsurface.position; target->subsurface.position = subsurface.position;
target->subsurfacePositionChanged = true;
} }
wl_list_insert_list(&target->frameCallbacks, &frameCallbacks); wl_list_insert_list(&target->frameCallbacks, &frameCallbacks);
target->shadowIsSet = shadowIsSet; if (shadowIsSet) {
if (target->shadowIsSet) {
target->shadow = shadow; target->shadow = shadow;
target->shadowIsSet = true;
} }
if (blurIsSet) {
target->blurIsSet = blurIsSet;
if (target->blurIsSet) {
target->blur = blur; target->blur = blur;
target->blurIsSet = true;
} }
if (contrastIsSet) {
target->contrastIsSet = contrastIsSet;
if (target->contrastIsSet) {
target->contrast = contrast; target->contrast = contrast;
target->contrastIsSet = true;
} }
if (slideIsSet) {
target->slideIsSet = slideIsSet;
if (target->slideIsSet) {
target->slide = slide; target->slide = slide;
target->slideIsSet = true;
} }
if (inputIsSet) {
target->inputIsSet = inputIsSet;
if (target->inputIsSet) {
target->input = input; target->input = input;
target->inputIsSet = true;
} }
if (opaqueIsSet) {
target->opaqueIsSet = opaqueIsSet;
if (target->opaqueIsSet) {
target->opaque = opaque; target->opaque = opaque;
target->opaqueIsSet = true;
} }
if (bufferScaleIsSet) {
target->bufferScaleIsSet = bufferScaleIsSet;
if (target->bufferScaleIsSet) {
target->bufferScale = bufferScale; target->bufferScale = bufferScale;
target->bufferScaleIsSet = true;
} }
if (bufferTransformIsSet) {
target->bufferTransformIsSet = bufferTransformIsSet;
if (target->bufferTransformIsSet) {
target->bufferTransform = bufferTransform; target->bufferTransform = bufferTransform;
target->bufferTransformIsSet = true;
} }
if (contentTypeIsSet) { if (contentTypeIsSet) {
target->contentType = contentType; target->contentType = contentType;