commit cd42f12c21d11f3d8c57c99fe252ee1d9da91e1b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Oct 27 10:06:12 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 27 10:06:12 2023 +0000
tree 075101e891e0a87f9bad19ff15a92b6b757d2da9
parent 1e5602afcb2e9a6f190ed607c7485b8acf87c754
parent a57eebae81825a0b89a7b5b7f78ce352e155d5c8

Merge "recovery: fix UI error when directories too many [1/1]" into main am: a57eebae81

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2786283

Change-Id: I09756b7c1a3f2bb620349385ff25cc3fbca3d8e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

recovery_ui/screen_ui.cpp

diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp
index ee3cbb1..37e0764 100644
--- a/recovery_ui/screen_ui.cpp
+++ b/recovery_ui/screen_ui.cpp
@@ -181,7 +181,15 @@
   if (!scrollable()) {
     offset += draw_funcs_.DrawHorizontalRule(y + offset) + 4;
   }
-  for (size_t i = MenuStart(); i < MenuEnd(); ++i) {
+
+  int items_block_height = gr_fb_height() - y - offset;;
+  int total = (char_height_ + 4) * (selection() + 1);;
+  int j = 0;
+  if (total > items_block_height) {
+    j = ((total - items_block_height) / (char_height_ + 4)) + 1;
+  }
+
+  for (size_t i = (MenuStart() + j); i < MenuEnd(); ++i) {
     bool bold = false;
     if (i == selection()) {
       // Draw the highlight bar.