Gui: unicode support, new canvas API

merge ofw commit
This commit is contained in:
MX
2024-03-25 14:04:07 +03:00
parent 585b7f963d
commit 9961dadee7
10 changed files with 259 additions and 225 deletions

View File

@@ -14,14 +14,14 @@
#define LOCKED_HINT_TIMEOUT_MS (1000)
#define UNLOCKED_HINT_TIMEOUT_MS (2000)
#define DOOR_OFFSET_START -55
#define DOOR_OFFSET_END 0
#define DOOR_OFFSET_START (-55)
#define DOOR_OFFSET_END (0)
#define DOOR_L_FINAL_POS 0
#define DOOR_R_FINAL_POS 60
#define DOOR_L_FINAL_POS (0)
#define DOOR_R_FINAL_POS (60)
#define UNLOCK_CNT 3
#define UNLOCK_RST_TIMEOUT 600
#define UNLOCK_CNT (3)
#define UNLOCK_RST_TIMEOUT (600)
struct DesktopViewLocked {
View* view;
@@ -63,10 +63,10 @@ static void locked_view_timer_callback(void* context) {
}
static void desktop_view_locked_doors_draw(Canvas* canvas, DesktopViewLockedModel* model) {
int8_t offset = model->door_offset;
uint8_t door_left_x = DOOR_L_FINAL_POS + offset;
uint8_t door_right_x = DOOR_R_FINAL_POS - offset;
uint8_t height = icon_get_height(&I_DoorLeft_70x55);
int32_t offset = model->door_offset;
int32_t door_left_x = DOOR_L_FINAL_POS + offset;
int32_t door_right_x = DOOR_R_FINAL_POS - offset;
size_t height = icon_get_height(&I_DoorLeft_70x55);
canvas_draw_icon(canvas, door_left_x, canvas_height(canvas) - height, &I_DoorLeft_70x55);
canvas_draw_icon(canvas, door_right_x, canvas_height(canvas) - height, &I_DoorRight_70x55);
}