Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca6ce2c8 authored by Tao Bao's avatar Tao Bao
Browse files

Fix the missing char when showing recovery logs. 

This is a regression when adding support for margin space in commit
171b4c4c.

We're losing one char when showing long log lines. Because text_ is
aware of kMarginWidth, but not the the added indent (TEXT_INDENT).

Test: 'View recovery logs' on angler, with no missing character.
Change-Id: I284d54681d603e85e69d8e9c25173b1437a704df
parent 918e6ea1

screen_ui.cpp

+5 −5
Original line number Diff line number Diff line
@@ -301,15 +301,15 @@ void ScreenRecoveryUI::draw_screen_locked() { 
  gr_color(0, 0, 0, 255);

  gr_clear();



  static constexpr int TEXT_INDENT = 4;

  int x = TEXT_INDENT + kMarginWidth;

  int y = kMarginHeight;

  if (show_menu) {

    std::string recovery_fingerprint =

        android::base::GetProperty("ro.bootimage.build.fingerprint", "");

    static constexpr int kMenuIndent = 4;

    int x = kMarginWidth + kMenuIndent;



    SetColor(INFO);

    y += DrawTextLine(x, y, "Android Recovery", true);

    std::string recovery_fingerprint =

        android::base::GetProperty("ro.bootimage.build.fingerprint", "");

    for (const auto& chunk : android::base::Split(recovery_fingerprint, ":")) {

      y += DrawTextLine(x, y, chunk.c_str(), false);

    }
@@ -343,7 +343,7 @@ void ScreenRecoveryUI::draw_screen_locked() { 
  size_t count = 0;

  for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_;

       ty -= char_height_, ++count) {

    DrawTextLine(x, ty, text_[row], false);

    DrawTextLine(kMarginWidth, ty, text_[row], false);

    --row;

    if (row < 0) row = text_rows_ - 1;

  }