diff options
| author | 2021-04-07 18:56:48 +0000 | |
|---|---|---|
| committer | 2021-04-07 18:56:48 +0000 | |
| commit | b16fa8e49508388184bbf1efff2092a036a54aa6 (patch) | |
| tree | 554e7ad9ba3c0d701c3403e47e6717449759749d /libs/gui/LayerState.cpp | |
| parent | 0de23a9eafae2db42781b6db6994c7d52621e7a9 (diff) | |
| parent | 9a93ea66bb7116b8821877a69991ae94557b1303 (diff) | |
Merge "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, 0 insertions, 4 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 2a9a97ed13..0ca497795b 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -459,10 +459,6 @@ 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; |