Update XLAT GUI layout and logo

teamfinalmouse · May 29, 2024 · 3dc7033 · 3dc7033
1 parent 01be21f
commit 3dc7033
Show file tree

Hide file tree

Showing 4 changed files with 358 additions and 358 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -175,7 +175,7 @@ add_executable(${PROJECT_NAME}
         src/syscalls.c
         src/system_stm32f7xx.c
         src/xlat.c
-        src/theme/xlat_logo_160px_width_idx8.c
+        src/theme/xlat_fm_logo_130px.c
         drivers/tft/tft.c
         drivers/touchpad/touchpad.c
         ${HAL_Sources}

diff --git a/src/gfx_main.c b/src/gfx_main.c
@@ -69,7 +69,7 @@ void gfx_set_device_label(const char * manufacturer, const char * productname, c
     lv_label_set_text(manufacturer_label, manufacturer);
     lv_label_set_text(productname_label, productname);
 
-    lv_obj_align(manufacturer_label, LV_ALIGN_TOP_RIGHT, 0, 0);
+    lv_obj_align(manufacturer_label, LV_ALIGN_TOP_RIGHT, -5, 5);
     lv_obj_align_to(vidpid_label, manufacturer_label, LV_ALIGN_OUT_LEFT_BOTTOM, -5, 0);
     lv_obj_align_to(productname_label, manufacturer_label, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 5);
 }
@@ -317,7 +317,7 @@ static void gfx_xlat_gui(void)
     // Draw logo
     lv_obj_t * logo = lv_img_create(lv_scr_act());
     lv_img_set_src(logo, &xlat_logo);
-    lv_obj_align(logo, LV_ALIGN_TOP_LEFT, 10, 10);
+    lv_obj_align(logo, LV_ALIGN_TOP_LEFT, 12, 5);
 
     ///////////////////////////
     // DEVICE INFO TOP RIGHT //