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

Commit c392888d authored by Luke Song's avatar Luke Song
Browse files

Restructure vr_ui 

Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.

Cherry picked from commit 81a8e4ca

Bug: 37779982
Test: Verified vr ui has same behavior.
Change-Id: Ifbf44e27d7101aedbe3c0e6db4b8181d56efadfd
parent edc6b52f

Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -107,6 +107,12 @@ else 
LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_WIDTH=0

endif



ifneq ($(TARGET_RECOVERY_UI_VR_STEREO_OFFSET),)

LOCAL_CFLAGS += -DRECOVERY_UI_VR_STEREO_OFFSET=$(TARGET_RECOVERY_UI_VR_STEREO_OFFSET)

else

LOCAL_CFLAGS += -DRECOVERY_UI_VR_STEREO_OFFSET=0

endif



LOCAL_C_INCLUDES += \

    system/vold \

screen_ui.cpp

+1 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ void ScreenRecoveryUI::draw_screen_locked() { 
  SetColor(LOG);

  int row = (text_top_ + text_rows_ - 1) % text_rows_;

  size_t count = 0;

  for (int ty = gr_fb_height() - kMarginHeight - char_height_ - log_bottom_offset_;

  for (int ty = gr_fb_height() - kMarginHeight - char_height_;

       ty >= y && count < text_rows_; ty -= char_height_, ++count) {

    int temp_y = ty;

    DrawTextLine(x, &temp_y, text_[row], false);
@@ -461,7 +461,6 @@ bool ScreenRecoveryUI::InitTextParams() { 
  gr_font_size(gr_sys_font(), &char_width_, &char_height_);

  text_rows_ = (gr_fb_height() - kMarginHeight * 2) / char_height_;

  text_cols_ = (gr_fb_width() - kMarginWidth * 2) / char_width_;

  log_bottom_offset_ = 0;

  return true;

}

screen_ui.h

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ class ScreenRecoveryUI : public RecoveryUI { 
    // Log text overlay, displayed when a magic key is pressed.

    char** text_;

    size_t text_col_, text_row_, text_top_;

    int log_bottom_offset_;



    bool show_text;

    bool show_text_ever;   // has show_text ever been true?

vr_ui.cpp

+5 −26
Original line number Diff line number Diff line
@@ -18,39 +18,18 @@ 


#include <minui/minui.h>



VrRecoveryUI::VrRecoveryUI() :

  x_offset(400),

  y_offset(400),

  stereo_offset(100) {

}

VrRecoveryUI::VrRecoveryUI() : kStereoOffset(RECOVERY_UI_VR_STEREO_OFFSET) {}



bool VrRecoveryUI::InitTextParams() {

  if (gr_init() < 0) {

    return false;

  }



  gr_font_size(gr_sys_font(), &char_width_, &char_height_);

  if (!ScreenRecoveryUI::InitTextParams()) return false;

  int mid_divide = gr_fb_width() / 2;

  text_rows_ = (gr_fb_height() - 2 * y_offset) / char_height_;

  text_cols_ = (mid_divide - x_offset - stereo_offset) / char_width_;

  log_bottom_offset_ = gr_fb_height() - 2 * y_offset;

  text_cols_ = (mid_divide - kMarginWidth - kStereoOffset) / char_width_;

  return true;

}



void VrRecoveryUI::DrawHorizontalRule(int* y) {

  SetColor(MENU);

  *y += 4;

  gr_fill(0, *y + y_offset, gr_fb_width(), *y + y_offset + 2);

  *y += 4;

}



void VrRecoveryUI::DrawHighlightBar(int x, int y, int width, int height) const {

  gr_fill(x, y + y_offset, x + width, y + y_offset + height);

}



void VrRecoveryUI::DrawTextLine(int x, int* y, const char* line, bool bold) const {

  int mid_divide = gr_fb_width() / 2;

  gr_text(gr_sys_font(), x + x_offset + stereo_offset, *y + y_offset, line, bold);

  gr_text(gr_sys_font(), x + x_offset - stereo_offset + mid_divide, *y + y_offset, line, bold);

  gr_text(gr_sys_font(), x + kStereoOffset, *y, line, bold);

  gr_text(gr_sys_font(), x - kStereoOffset + mid_divide, *y, line, bold);

  *y += char_height_ + 4;

}

vr_ui.h

+1 −3
Original line number Diff line number Diff line
@@ -26,12 +26,10 @@ class VrRecoveryUI : public ScreenRecoveryUI { 
  protected:

    // Pixel offsets to move drawing functions to visible range.

    // Can vary per device depending on screen size and lens distortion.

    int x_offset, y_offset, stereo_offset;

    const int kStereoOffset;



    bool InitTextParams() override;



    void DrawHorizontalRule(int* y) override;

    void DrawHighlightBar(int x, int y, int width, int height) const override;

    void DrawTextLine(int x, int* y, const char* line, bool bold) const override;

};