Optimize TV mode focus switching

xfangfang · Jul 8, 2024 · b5502a8 · b5502a8
1 parent c470df3
commit b5502a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/resources/xml/activity/search_activity_tv.xml b/resources/xml/activity/search_activity_tv.xml
@@ -11,6 +11,7 @@
                 width="400">
             <brls:Box
                     focusable="true"
+                    focusDown="tv/search/search"
                     alignItems="center"
                     marginLeft="10"
                     width="310">

diff --git a/wiliwili/source/activity/search_activity_tv.cpp b/wiliwili/source/activity/search_activity_tv.cpp
@@ -160,6 +160,7 @@ void TVSearchActivity::onContentAvailable() {
                 this->updateInputLabel();
             },
             "wiliwili/search/tv/hint"_i18n, "", 32, getCurrentSearch(), 0);
+        inputLabel->getParent()->setCustomNavigationRoute(brls::FocusDirection::DOWN, searchLabel);
         return true;
     });
     inputLabel->getParent()->addGestureRecognizer(new brls::TapGestureRecognizer(this->inputLabel->getParent()));
@@ -183,6 +184,7 @@ void TVSearchActivity::onContentAvailable() {
     clearLabel->registerClickAction([this](...) {
         this->currentSearch.clear();
         this->updateInputLabel();
+        inputLabel->getParent()->setCustomNavigationRoute(brls::FocusDirection::DOWN, clearLabel);
         return true;
     });
     clearLabel->addGestureRecognizer(new brls::TapGestureRecognizer(clearLabel));
@@ -193,12 +195,14 @@ void TVSearchActivity::onContentAvailable() {
         }
         currentSearch.erase(currentSearch.size() - 1, 1);
         this->updateInputLabel();
+        inputLabel->getParent()->setCustomNavigationRoute(brls::FocusDirection::DOWN, deleteLabel);
         return true;
     });
     deleteLabel->addGestureRecognizer(new brls::TapGestureRecognizer(deleteLabel));
 
     searchLabel->registerClickAction([this](...) {
         this->search(getCurrentSearch());
+        inputLabel->getParent()->setCustomNavigationRoute(brls::FocusDirection::DOWN, searchLabel);
         return true;
     });
     searchLabel->addGestureRecognizer(new brls::TapGestureRecognizer(searchLabel));