Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a am: 4b9611592a am: 56728e6c47

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

Change-Id: I962180ed7be50496f521a7bee247b46a92575780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ben Fennema 2023-11-09 04:01:22 +00:00 committed by Automerger Merge Worker
commit 936e13d4fd

View file

@ -181,15 +181,7 @@ int TextMenu::DrawItems(int x, int y, int screen_width, bool long_press) const {
if (!scrollable()) { if (!scrollable()) {
offset += draw_funcs_.DrawHorizontalRule(y + offset) + 4; 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; bool bold = false;
if (i == selection()) { if (i == selection()) {
// Draw the highlight bar. // Draw the highlight bar.