From 57caf24504ec8982191acaf6fbcf5015c5eb2d60 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Tue, 29 Oct 2024 22:43:34 -0700 Subject: [PATCH] homescreens/folio: Never open both search and app drawer This ensures that the search widget and app drawer never simultaneously both get opened. --- containments/homescreens/folio/homescreenstate.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/containments/homescreens/folio/homescreenstate.cpp b/containments/homescreens/folio/homescreenstate.cpp index cc69b6a4..0a131420 100644 --- a/containments/homescreens/folio/homescreenstate.cpp +++ b/containments/homescreens/folio/homescreenstate.cpp @@ -680,6 +680,9 @@ QPointF HomeScreenState::getFolderDelegateScreenPosition(int position) void HomeScreenState::openAppDrawer() { + // Ensure search widget is closed when app drawer opens + closeSearchWidget(); + cancelAppDrawerAnimations(); m_openAppDrawerAnim->setStartValue(m_appDrawerY); m_openAppDrawerAnim->start(); @@ -694,6 +697,9 @@ void HomeScreenState::closeAppDrawer() void HomeScreenState::openSearchWidget() { + // Ensure app drawer is closed when search widget opens + closeAppDrawer(); + cancelSearchWidgetAnimations(); m_openSearchWidgetAnim->setStartValue(m_searchWidgetY); m_openSearchWidgetAnim->start();