liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FL-2534: change button text in format dialog and fix incorrect dialog_ex behavior when text is not set (#1253)

Browse Source
This commit is contained in:
あく
2022-05-20 21:40:49 +03:00
committed by GitHub
parent e8de94ca00
commit 8d737133fe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/gui/modules/dialog_ex.c
View File

@@ -45,8 +45,8 @@ static void dialog_ex_view_draw_callback(Canvas* canvas, void* _model) {
} }
// Draw header // Draw header
canvas_set_font(canvas, FontPrimary);
if(model->header.text != NULL) { if(model->header.text != NULL) {
canvas_set_font(canvas, FontPrimary);
elements_multiline_text_aligned( elements_multiline_text_aligned(
canvas, canvas,
model->header.x, model->header.x,
@@ -57,8 +57,8 @@ static void dialog_ex_view_draw_callback(Canvas* canvas, void* _model) {
} }
// Draw text // Draw text
canvas_set_font(canvas, FontSecondary);
if(model->text.text != NULL) { if(model->text.text != NULL) {
canvas_set_font(canvas, FontSecondary);
elements_multiline_text_aligned( elements_multiline_text_aligned(
canvas, canvas,
model->text.x, model->text.x,

2
applications/storage_settings/scenes/storage_settings_scene_format_confirm.c
View File

@@ -11,7 +11,7 @@ void storage_settings_scene_format_confirm_on_enter(void* context) {
StorageSettings* app = context; StorageSettings* app = context;
FS_Error sd_status = storage_sd_status(app->fs_api); FS_Error sd_status = storage_sd_status(app->fs_api);
DialogEx* dialog_ex = app->dialog_ex; DialogEx* dialog_ex = app->dialog_ex;
dialog_ex_set_left_button_text(dialog_ex, "Back"); dialog_ex_set_left_button_text(dialog_ex, "Cancel");
if(sd_status == FSE_NOT_READY) { if(sd_status == FSE_NOT_READY) {
dialog_ex_set_header(dialog_ex, "SD card not mounted", 64, 10, AlignCenter, AlignCenter); dialog_ex_set_header(dialog_ex, "SD card not mounted", 64, 10, AlignCenter, AlignCenter);