cash2ecash

cash2ecash: cash acceptor that issues digital cash (experimental)
Log | Files | Refs | Submodules | README | LICENSE

commit a8af740f074a2b78e350b7254fceab8fb88427ac
parent 6401802dc7c452bc71f9170edf0159760d88d578
Author: Manuel Geissbühler <manuel@debian>
Date:   Fri, 27 Dec 2024 21:29:07 +0100

small corrections

Diffstat:
Msrc/gui/screen.hpp | 9++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gui/screen.hpp b/src/gui/screen.hpp @@ -42,8 +42,7 @@ class Screen { screenPointer = lv_obj_create(NULL); //Set the Layout of the screen to Grid - lv_obj_set_style_grid_column_dsc_array(screenPointer, columnDesc, 0); - lv_obj_set_style_grid_row_dsc_array(screenPointer, rowDesc, 0); + lv_obj_set_grid_dsc_array(screenPointer, columnDesc, rowDesc); lv_obj_set_layout(screenPointer, LV_LAYOUT_GRID); //Add empty widdgets to the Grid Layout as containers to be filled by child classes @@ -56,19 +55,19 @@ class Screen { instructionsContainer = lv_obj_create(screenPointer); lv_obj_set_size(instructionsContainer, LV_SIZE_CONTENT, LV_SIZE_CONTENT); - lv_obj_set_grid_cell(instructionsContainer, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 1, 1); + lv_obj_set_grid_cell(instructionsContainer, LV_GRID_ALIGN_START, 1, 1, LV_GRID_ALIGN_START, 0, 1); label = lv_label_create(instructionsContainer); lv_label_set_text(label, "instructionsContainer"); buttonsContainer = lv_obj_create(screenPointer); lv_obj_set_size(buttonsContainer, LV_SIZE_CONTENT, LV_SIZE_CONTENT); - lv_obj_set_grid_cell(buttonsContainer, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 0, 2); + lv_obj_set_grid_cell(buttonsContainer, LV_GRID_ALIGN_START, 2, 1, LV_GRID_ALIGN_START, 0, 2); label = lv_label_create(buttonsContainer); lv_label_set_text(label, "buttonsContainer"); mainContentContainer = lv_obj_create(screenPointer); lv_obj_set_size(mainContentContainer, LV_SIZE_CONTENT, LV_SIZE_CONTENT); - lv_obj_set_grid_cell(mainContentContainer, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 0, 2); + lv_obj_set_grid_cell(mainContentContainer, LV_GRID_ALIGN_START, 1, 1, LV_GRID_ALIGN_START, 1, 1); label = lv_label_create(mainContentContainer); lv_label_set_text(label, "mainContenContainer");