diff options
| author | 2021-02-02 23:12:36 +0000 | |
|---|---|---|
| committer | 2021-02-02 23:12:36 +0000 | |
| commit | a73115b7c6601b3a5fe3dfac68b1af5d8eaae328 (patch) | |
| tree | 1dccfe273f270cefd354d676d3d1b4e32732eedc /libs/gui/LayerState.cpp | |
| parent | 58144273809dc92c36f901190cc825e1739de2bd (diff) | |
| parent | 8ba8b076a0335155a57a9e8004614c302d07c154 (diff) | |
Merge "Remove detachChildren" into sc-dev
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -rw-r--r-- | libs/gui/LayerState.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 3f314cd9de..fff33056e1 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -426,9 +426,6 @@ void layer_state_t::merge(const layer_state_t& other) { what |= eReparentChildren; reparentSurfaceControl = other.reparentSurfaceControl; } - if (other.what & eDetachChildren) { - what |= eDetachChildren; - } if (other.what & eRelativeLayerChanged) { what |= eRelativeLayerChanged; what &= ~eLayerChanged; |