From 0c0ed1a6f7a2738087fef7f4f697171f39106c9f Mon Sep 17 00:00:00 2001 From: kraus Date: Thu, 6 Jan 2022 12:01:42 +0100 Subject: [PATCH] update --- csrc/mui_u8g2.c | 2 +- csrc/mui_u8g2.h | 4 ++-- sys/sdl/mui_ref/main.c | 10 ++++++++-- sys/sdl/mui_ref/mui_u8g2_u16_list_line.gif | Bin 0 -> 43987 bytes 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 sys/sdl/mui_ref/mui_u8g2_u16_list_line.gif diff --git a/csrc/mui_u8g2.c b/csrc/mui_u8g2.c index fa022a33..d528f19d 100644 --- a/csrc/mui_u8g2.c +++ b/csrc/mui_u8g2.c @@ -1515,7 +1515,7 @@ uint8_t mui_u8g2_goto_form_w1_mse_pf(mui_t *ui, uint8_t msg) { case MUIF_MSG_DRAW: if ( mui_GetSelectableFieldTextOption(ui, ui->last_form_fds, arg + ui->form_scroll_top) ) - mui_u8g2_draw_button_pf(ui, u8g2_GetDisplayWidth(u8g2)-mui_get_x(ui)*2, mui_get_x(ui), ui->text+1); + mui_u8g2_draw_button_pf(ui, u8g2_GetDisplayWidth(u8g2)-mui_get_x(ui)*2, mui_get_x(ui)-1, ui->text+1); break; case MUIF_MSG_CURSOR_SELECT: if ( mui_GetSelectableFieldTextOption(ui, ui->last_form_fds, ui->arg + ui->form_scroll_top) ) diff --git a/csrc/mui_u8g2.h b/csrc/mui_u8g2.h index f011aa00..b2a72dff 100644 --- a/csrc/mui_u8g2.h +++ b/csrc/mui_u8g2.h @@ -146,10 +146,10 @@ uint8_t mui_u8g2_goto_data(mui_t *ui, uint8_t msg); /* MU //uint8_t mui_u8g2_goto_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_BUTTON, MUI_XYA */ // renamed to uint8_t mui_u8g2_goto_form_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_BUTTON, MUI_XYA */ -uint8_t mui_u8g2_goto_form_w1_mse_pf(mui_t *ui, uint8_t msg); /* not tested */ +uint8_t mui_u8g2_goto_form_w1_mse_pf(mui_t *ui, uint8_t msg); /* MUIF_BUTTON, MUI_XYA */ -uint8_t mui_u8g2_u8_char_wm_mud_pi(mui_t *ui, uint8_t msg); /* MUIF_VARIABLE,MUI_XY, usually requires a monospaced font line profont12 */ +uint8_t mui_u8g2_u8_char_wm_mud_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE,MUI_XY, usually requires a monospaced font line profont12 */ /*===== data = mui_u8g2_u8_min_max_t* =====*/ diff --git a/sys/sdl/mui_ref/main.c b/sys/sdl/mui_ref/main.c index 0b10fe51..b2af0c3e 100644 --- a/sys/sdl/mui_ref/main.c +++ b/sys/sdl/mui_ref/main.c @@ -925,7 +925,7 @@ int main(void) mui_Init(&ui, &u8g2, fds, muif_list, sizeof(muif_list)/sizeof(muif_t)); mui_GotoForm(&ui, 1, 0); - draw(1, "", ""); return 0; + //draw(1, "", ""); return 0; /* @@ -938,9 +938,15 @@ int main(void) draw(20, "assssnsnssnnnnnnsnsnnssppssssssnsnnnssnpppppppsns.q", "mui_uint8_number.gif"); draw(30, "assnsnsnssnsnsssnsns.q", "mui_uint8_checkbox_radio.gif"); draw(40, "asnnssnsnssppsnsnnsnnsssnsnnnssnnsns.q", "mui_u8g2_u8_opt_line_wa.gif"); + draw(50, "assnnnnsnnspppsnsnssnnnsnnsnnnnnnnsns.q", "mui_u8g2_u8_opt_parent.gif"); + draw(60, "assppppppsnsnnnnnnnnnsnsppppppppppppppppppppsnsnnnsns.q", "mui_u8g2_u8_char_wm_mud_pi.gif"); */ - draw(50, "assnnnnsnnspppsnsnssnnnsnnsnnnnnnnsns.q", "mui_u8g2_u8_opt_parent.gif"); + draw(70, "assssssnsnssnnnnnnsnnspsns.q", "mui_u8g2_u16_list_line.gif"); + + + + return 0; } diff --git a/sys/sdl/mui_ref/mui_u8g2_u16_list_line.gif b/sys/sdl/mui_ref/mui_u8g2_u16_list_line.gif new file mode 100644 index 0000000000000000000000000000000000000000..cf337e2f0cc039ed2308fe8a3f5b7dbc38d04ddd GIT binary patch literal 43987 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