diff options
| author | 2021-04-09 07:34:03 +0000 | |
|---|---|---|
| committer | 2021-04-09 07:34:03 +0000 | |
| commit | a9a65fc0cda53e903f68a3c9404801e67e3fd74c (patch) | |
| tree | ebaaa4db856b52d1367c97162ddbf115de85526b /libs/gui/LayerState.cpp | |
| parent | 3149c46550e78358fd8fd2c4089d84921263e2ab (diff) | |
| parent | 1014c4bf14f5c250b78d7e917fb59aaa9b0d9b0a (diff) | |
Merge "Revert "Remove setFrame from BufferStateLayer"" into sc-dev
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -rw-r--r-- | libs/gui/LayerState.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 0ca497795b..2a9a97ed13 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -459,6 +459,10 @@ void layer_state_t::merge(const layer_state_t& other) { what |= eCropChanged; crop = other.crop; } + if (other.what & eFrameChanged) { + what |= eFrameChanged; + orientedDisplaySpaceRect = other.orientedDisplaySpaceRect; + } if (other.what & eBufferChanged) { what |= eBufferChanged; buffer = other.buffer; |