Merge branch 'ul-dev' into xfw-dev

This commit is contained in:
Willy-JL
2023-05-02 04:44:43 +01:00
26 changed files with 986 additions and 28 deletions

View File

@@ -309,5 +309,6 @@ bool desktop_view_locked_is_locked_hint_visible(DesktopViewLocked* locked_view)
DesktopViewLockedModel* model = view_get_model(locked_view->view);
const DesktopViewLockedState view_state = model->view_state;
view_commit_model(locked_view->view, false);
return view_state == DesktopViewLockedStateLockedHintShown;
return view_state == DesktopViewLockedStateLockedHintShown ||
view_state == DesktopViewLockedStateLocked;
}