From 86cfb5138a8ebc149d715ada84b44de6ae5bc54d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Aug 2023 21:37:41 +0200 Subject: [PATCH] Fixed screen height - corrected the SCREEN_HEIGHT - small graphical changes in OmoteUI to make it look like in the main branch --- Platformio/OmoteUI/OmoteUI.cpp | 8 +++++++- Platformio/platformio.ini | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Platformio/OmoteUI/OmoteUI.cpp b/Platformio/OmoteUI/OmoteUI.cpp index 2aae975..042febd 100644 --- a/Platformio/OmoteUI/OmoteUI.cpp +++ b/Platformio/OmoteUI/OmoteUI.cpp @@ -163,7 +163,7 @@ void OmoteUI::layout_UI() { lv_label_set_text_fmt(buttonLabel, "0", col, row); lv_obj_set_user_data(obj, (void *)9); } - lv_obj_set_style_text_font(buttonLabel, &lv_font_montserrat_14, + lv_obj_set_style_text_font(buttonLabel, &lv_font_montserrat_24, LV_PART_MAIN); lv_obj_center(buttonLabel); } @@ -190,6 +190,9 @@ void OmoteUI::layout_UI() { appleImg = imgs.addAppleBackIcon(button); lv_obj_align(appleImg, LV_ALIGN_CENTER, -3, 0); + lv_obj_set_style_img_recolor(appleImg, lv_color_white(), LV_PART_MAIN); + lv_obj_set_style_img_recolor_opa(appleImg, LV_OPA_COVER, LV_PART_MAIN); + lv_obj_align(appleImg, LV_ALIGN_CENTER, -3, 0); button = lv_btn_create(tab3); lv_obj_align(button, LV_ALIGN_BOTTOM_RIGHT, -10, 0); @@ -202,6 +205,9 @@ void OmoteUI::layout_UI() { appleImg = imgs.addAppleDisplayImage(button); lv_obj_align(appleImg, LV_ALIGN_CENTER, 0, 0); + lv_obj_set_style_img_recolor(appleImg, lv_color_white(), LV_PART_MAIN); + lv_obj_set_style_img_recolor_opa(appleImg, LV_OPA_COVER, LV_PART_MAIN); + lv_obj_align(appleImg, LV_ALIGN_CENTER, 0, 0); // Add content to the settings tab // With a flex layout, setting groups/boxes will position themselves diff --git a/Platformio/platformio.ini b/Platformio/platformio.ini index ca07004..4e883c7 100644 --- a/Platformio/platformio.ini +++ b/Platformio/platformio.ini @@ -35,7 +35,7 @@ build_flags = ;------------ OMOTE Defines ----------------------------------- ; Currently based on the ILI9341_DRIVER -D SCREEN_WIDTH=240 - -D SCREEN_HEIGHT=360 + -D SCREEN_HEIGHT=320 ; ------------- Includes ------------------------------------ -I OmoteUI