github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(msgbox) add parent attribute to lv_msgbox_create()

Browse Source 
It keeps the consistency of create functions and allows craeting non-modal message boxes
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-26 12:15:55 +02:00
parent d4deb28663
commit da39d692dd
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/widgets/msgbox/lv_example_msgbox_1.c
View File

@@ -3,7 +3,7 @@
static void event_cb(lv_event_t * e)
{
lv_obj_t * obj = lv_event_get_target(e);
lv_obj_t * obj = lv_event_get_current_target(e);
LV_LOG_USER("Button %s clicked", lv_msgbox_get_active_btn_text(obj));
}
@@ -11,7 +11,7 @@ void lv_example_msgbox_1(void)
{
static const char * btns[] ={"Apply", "Close", ""};
lv_obj_t * mbox1 = lv_msgbox_create("Hello", "This is a message box with two buttons.", btns, true);
lv_obj_t * mbox1 = lv_msgbox_create(NULL, "Hello", "This is a message box with two buttons.", btns, true);
lv_obj_add_event_cb(mbox1, event_cb, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_center(mbox1);
}

26
src/extra/widgets/msgbox/lv_msgbox.c
View File

@@ -13,6 +13,7 @@
/*********************
* DEFINES
*********************/
#define LV_MSGBOX_FLAG_AUTO_PARENT LV_OBJ_FLAG_WIDGET_1 /*Mark that the parent was automatically created*/
/**********************
* TYPEDEFS
@@ -36,23 +37,23 @@ const lv_obj_class_t lv_msgbox_class = {.base_class = &lv_obj_class};
* GLOBAL FUNCTIONS
**********************/
/**
* Create a message box objects
* @param par pointer to an object, it will be the parent of the new message box
* @return pointer to the created message box
*/
lv_obj_t * lv_msgbox_create(const char * title, const char * txt, const char * btn_txts[], bool add_close_btn)
lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char * txt, const char * btn_txts[], bool add_close_btn)
{
lv_obj_t * parent = lv_obj_create(lv_scr_act());
lv_obj_remove_style_all(parent);
lv_obj_set_style_bg_color(parent, lv_palette_main(LV_PALETTE_GREY), 0);
lv_obj_set_style_bg_opa(parent, LV_OPA_50, 0);
lv_obj_set_size(parent, LV_PCT(100), LV_PCT(100));
bool auto_parent = false;
if(parent == NULL) {
auto_parent = true;
parent = lv_obj_create(lv_scr_act());
lv_obj_remove_style_all(parent);
lv_obj_set_style_bg_color(parent, lv_palette_main(LV_PALETTE_GREY), 0);
lv_obj_set_style_bg_opa(parent, LV_OPA_50, 0);
lv_obj_set_size(parent, LV_PCT(100), LV_PCT(100));
}
lv_obj_t * mbox = lv_obj_create_from_class(&lv_msgbox_class, parent);
LV_ASSERT_MALLOC(mbox);
if(mbox == NULL) return NULL;
if(auto_parent) lv_obj_add_flag(mbox, LV_MSGBOX_FLAG_AUTO_PARENT);
lv_coord_t w = lv_obj_get_content_width(parent);
if(w > 2 * LV_DPI_DEF) w = 2 * LV_DPI_DEF;
@@ -130,7 +131,8 @@ const char * lv_msgbox_get_active_btn_text(lv_obj_t * mbox)
void lv_msgbox_close(lv_obj_t * mbox)
{
lv_obj_del(lv_obj_get_parent(mbox));
if(lv_obj_has_flag(mbox, LV_MSGBOX_FLAG_AUTO_PARENT)) lv_obj_del(lv_obj_get_parent(mbox));
else lv_obj_del(mbox);
}

10
src/extra/widgets/msgbox/lv_msgbox.h
View File

@@ -41,10 +41,14 @@ extern const lv_obj_class_t lv_msgbox_class;
/**
* Create a message box objects
* @param par pointer to an object, it will be the parent of the new message box
* @return pointer to the created message box
* @param parent pointer to parent or NULL to create a full screen modal message box
* @param title the title of the message box
* @param txt the text of the message box
* @param btn_txts the buttons as an array of texts terminated by an "" element. E.g. {"btn1", "btn2", ""}
* @param add_close_btn true: add a close button
* @return pointer to the message box object
*/
lv_obj_t * lv_msgbox_create(const char * title, const char * txt, const char * btn_txts[], bool add_close_btn);
lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char * txt, const char * btn_txts[], bool add_close_btn);
lv_obj_t * lv_msgbox_get_title(lv_obj_t * mbox);