diff options
| author | Ben Fennema <fennema@google.com> | 2023-11-09 02:38:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-09 02:38:58 +0000 |
| commit | 4b9611592adc44aa96728d64b7e47bccf8d84dbb (patch) | |
| tree | 7758ae459c1438142b6dfaec09bbef15f0e3172e | |
| parent | 6dcb48b30dbf55c72d63d6d352cb0b97eab53241 (diff) | |
| parent | 1fb40d753a1a43d96dc85131b04a068fe6058a94 (diff) | |
| download | recovery-4b9611592adc44aa96728d64b7e47bccf8d84dbb.tar.gz | |
Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823390
Change-Id: If9efd8b9534c82bd65a32d190af2b0e95cfed0ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | recovery_ui/screen_ui.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp index 37e07646..ee3cbb13 100644 --- a/recovery_ui/screen_ui.cpp +++ b/recovery_ui/screen_ui.cpp @@ -181,15 +181,7 @@ int TextMenu::DrawItems(int x, int y, int screen_width, bool long_press) const { if (!scrollable()) { offset += draw_funcs_.DrawHorizontalRule(y + offset) + 4; } - - 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) { + for (size_t i = MenuStart(); i < MenuEnd(); ++i) { bool bold = false; if (i == selection()) { // Draw the highlight bar. |