diff options
Diffstat (limited to 'lib/luavgl/src')
| -rw-r--r-- | lib/luavgl/src/imgdata.c | 38 | ||||
| -rw-r--r-- | lib/luavgl/src/luavgl.c | 2 | ||||
| -rw-r--r-- | lib/luavgl/src/luavgl.h | 5 | ||||
| -rw-r--r-- | lib/luavgl/src/lvgl.lua | 7 | ||||
| -rw-r--r-- | lib/luavgl/src/util.c | 11 | ||||
| -rw-r--r-- | lib/luavgl/src/widgets/slider.c | 10 |
6 files changed, 72 insertions, 1 deletions
diff --git a/lib/luavgl/src/imgdata.c b/lib/luavgl/src/imgdata.c new file mode 100644 index 00000000..9f7a2a01 --- /dev/null +++ b/lib/luavgl/src/imgdata.c @@ -0,0 +1,38 @@ +#include "draw/lv_img_buf.h" +#include "draw/lv_img_decoder.h" +#include "lauxlib.h" +#include "lua.h" +#include "luavgl.h" +#include "misc/lv_color.h" +#include "misc/lv_mem.h" +#include "misc/lv_types.h" +#include "private.h" +#include <stdint.h> +#include <string.h> + +static int luavgl_imgdata_create(lua_State *L) +{ + if (!lua_isstring(L, 1)) { + return luaL_argerror(L, 1, "expect string"); + } + + lv_img_decoder_dsc_t descriptor; + lv_res_t res = + lv_img_decoder_open(&descriptor, lua_tostring(L, 1), lv_color_black(), 0); + if (res != LV_RES_OK) { + return luaL_error(L, "failed to decode image."); + } + + lv_img_dsc_t *data = lv_mem_alloc(sizeof(lv_img_dsc_t)); + data->header = descriptor.header; + data->data_size = data->header.w * data->header.h * sizeof(uint32_t); // ??? + + uint8_t *data_copy = lv_mem_alloc(data->data_size); + memcpy(data_copy, descriptor.img_data, data->data_size); + data->data = data_copy; + + lv_img_decoder_close(&descriptor); + + lua_pushlightuserdata(L, data); + return 1; +} diff --git a/lib/luavgl/src/luavgl.c b/lib/luavgl/src/luavgl.c index 86c1a108..2d0af07a 100644 --- a/lib/luavgl/src/luavgl.c +++ b/lib/luavgl/src/luavgl.c @@ -7,6 +7,7 @@ #include "font.c" #include "fs.c" #include "group.c" +#include "imgdata.c" #include "indev.c" #include "obj.c" #include "timer.c" @@ -17,6 +18,7 @@ static const struct luaL_Reg luavgl_methods[] = { {"Font", luavgl_font_create }, /* font.c */ {"Style", luavgl_style_create}, /* style.c */ {"Anim", luavgl_anim_create }, /* anim.c */ + {"ImgData", luavgl_imgdata_create}, /* imgdata.c */ {NULL, NULL }, }; diff --git a/lib/luavgl/src/luavgl.h b/lib/luavgl/src/luavgl.h index b26bb5c7..c76a6493 100644 --- a/lib/luavgl/src/luavgl.h +++ b/lib/luavgl/src/luavgl.h @@ -158,6 +158,11 @@ LUALIB_API int luavgl_obj_getuserdatauv(lua_State *L, int idx); LUALIB_API lv_obj_t *luavgl_to_obj(lua_State *L, int idx); /** + * @brief Get lvgl style from stack + */ +LUALIB_API lv_style_t *luavgl_to_style(lua_State *L, int idx); + +/** * @brief Convert value to integer * * Supported values are: integer, float, boolean diff --git a/lib/luavgl/src/lvgl.lua b/lib/luavgl/src/lvgl.lua index e06f673d..c8aba5e0 100644 --- a/lib/luavgl/src/lvgl.lua +++ b/lib/luavgl/src/lvgl.lua @@ -1098,6 +1098,11 @@ end function slider:value() end +--- get whether slider is dragged or not +--- @return boolean +function slider:is_dragged() +end + --- --- Switch widget ---@class Switch:Object @@ -1374,7 +1379,7 @@ end --- @field pad_gap? integer --- @field bg_color? integer | string text color in hex integer or #RGB or #RRGGBB format --- @field bg_opa? integer ---- @field bg_grad_color? integer +--- @field bg_grad_color? integer | string text color in hex integer or #RGB or #RRGGBB format --- @field bg_grad_dir? integer --- @field bg_main_stop? integer --- @field bg_grad_stop? integer diff --git a/lib/luavgl/src/util.c b/lib/luavgl/src/util.c index 2042a6d9..7fb86906 100644 --- a/lib/luavgl/src/util.c +++ b/lib/luavgl/src/util.c @@ -272,6 +272,17 @@ LUALIB_API lv_obj_t *luavgl_to_obj(lua_State *L, int idx) return lobj->obj; } +LUALIB_API lv_style_t *luavgl_to_style(lua_State *L, int idx) +{ + luavgl_style_t *lsty = luavgl_check_style(L, idx); + if (lsty == NULL) { + luaL_argerror(L, idx, "expect lua lvgl style, got null"); + return NULL; + } + + return &lsty->style; +} + LUALIB_API int luavgl_tointeger(lua_State *L, int idx) { int v = 0; diff --git a/lib/luavgl/src/widgets/slider.c b/lib/luavgl/src/widgets/slider.c index c385f6bb..ad093fb5 100644 --- a/lib/luavgl/src/widgets/slider.c +++ b/lib/luavgl/src/widgets/slider.c @@ -73,9 +73,19 @@ static int luavgl_slider_tostring(lua_State *L) { return 1; } +static int luavgl_slider_is_dragged(lua_State *L) { + lv_obj_t *obj = luavgl_to_obj(L, 1); + bool is_dragged = lv_slider_is_dragged(obj); + lv_group_t * g = lv_obj_get_group(obj); + bool editing = lv_group_get_editing(g); + lua_pushboolean(L, editing || is_dragged); + return 1; +} + static const luaL_Reg luavgl_slider_methods[] = { {"set", luavgl_slider_set}, {"value", luavgl_slider_value}, + {"is_dragged", luavgl_slider_is_dragged}, {NULL, NULL}, }; |
