Skip to content

fix(style): for imgsrc type #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cnjhb wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(style): for imgsrc type #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eb02de
fix(style): for imgsrc type
cnjhb Sep 2, 2025
4f98567
doc(style): add part and fix obj:set_style
cnjhb Sep 2, 2025
beb8b93
fix(style): allow nil for obj:remove_style
cnjhb Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/lvgl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,19 @@ lvgl.STATE = {
ANY = 0,
}

--- @enum ObjPart
lvgl.PART = {
MAIN = 0,
SCROLLBAR = 0,
INDICATOR = 0,
KNOB = 0,
SELECTOR = 0,
ITEMS = 0,
CURSOR = 0,
CURSOR_FIRST = 0,
ANY = 0 ,
}

--- @enum ObjAlignType
lvgl.ALIGN = {
DEFAULT = 0,
Expand Down Expand Up @@ -552,9 +565,9 @@ end
---
--- Set object property
--- @param p StyleProp
--- @param state ObjState
--- @param selector? integer
---
function obj:set_style(p, state)
function obj:set_style(p, selector)
end

---
Expand Down
106 changes: 78 additions & 28 deletions src/style.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#include "private.h"
#include "rotable.h"

static const int style_imgsrc_key;

typedef struct {
lv_style_t style;
} luavgl_style_t;
Expand Down Expand Up @@ -35,7 +37,7 @@ enum {

/* callback made when style matched. */
typedef void (*style_set_cb_t)(lv_style_prop_t prop, lv_style_value_t value,
void *args);
lua_State *L, style_type_t type, void *args);

static const struct style_map_s {
const char *name;
Expand Down Expand Up @@ -164,9 +166,21 @@ static luavgl_style_t *luavgl_check_style(lua_State *L, int index)
}

static void lv_style_set_cb(lv_style_prop_t prop, lv_style_value_t value,
void *args)
lua_State *L, style_type_t type, void *args)
{
lv_style_t *s = args;
if (type == STYLE_TYPE_IMGSRC) {
if (lua_type(L, -1) == LUA_TSTRING) {
lua_pushlightuserdata(L, (void *)&style_imgsrc_key);
lua_rawget(L, LUA_REGISTRYINDEX);
lua_pushvalue(L, 1);
void *str = lua_newuserdata(L, lv_strlen(value.ptr) + 1);
lv_strcpy(str, value.ptr);
lua_rawset(L, -3);
lua_pop(L, 1);
value.ptr = str;
}
}
lv_style_set_prop(s, prop, value);
}

Expand Down Expand Up @@ -292,9 +306,9 @@ static int luavgl_set_flex_layout_kv(lua_State *L, style_set_cb_t cb,

lv_style_value_t value = {0};
value.num = LV_LAYOUT_FLEX;
cb(LV_STYLE_LAYOUT, value, args);
cb(LV_STYLE_LAYOUT, value, L, 0, args);
value.num = flow;
cb(LV_STYLE_FLEX_FLOW, value, args);
cb(LV_STYLE_FLEX_FLOW, value, L, 0, args);

/**
* justify-content
Expand All @@ -305,7 +319,7 @@ static int luavgl_set_flex_layout_kv(lua_State *L, style_set_cb_t cb,
if (lua_type(L, -1) == LUA_TSTRING) {
align = luavgl_to_flex_align(L, -1);
value.num = align;
cb(LV_STYLE_FLEX_MAIN_PLACE, value, args);
cb(LV_STYLE_FLEX_MAIN_PLACE, value, L, 0, args);
}
lua_pop(L, 1);

Expand All @@ -318,7 +332,7 @@ static int luavgl_set_flex_layout_kv(lua_State *L, style_set_cb_t cb,
if (lua_type(L, -1) == LUA_TSTRING) {
align = luavgl_to_flex_align(L, -1);
value.num = align;
cb(LV_STYLE_FLEX_CROSS_PLACE, value, args);
cb(LV_STYLE_FLEX_CROSS_PLACE, value, L, 0, args);
}
lua_pop(L, 1);

Expand All @@ -331,7 +345,7 @@ static int luavgl_set_flex_layout_kv(lua_State *L, style_set_cb_t cb,
if (lua_type(L, -1) == LUA_TSTRING) {
align = luavgl_to_flex_align(L, -1);
value.num = align;
cb(LV_STYLE_FLEX_TRACK_PLACE, value, args);
cb(LV_STYLE_FLEX_TRACK_PLACE, value, L, 0, args);
}
lua_pop(L, 1);

Expand Down Expand Up @@ -415,30 +429,30 @@ static int luavgl_set_style_kv(lua_State *L, style_set_cb_t cb, void *args)
switch ((int)prop) {
/* style combinations */
case LV_STYLE_SIZE:
cb(LV_STYLE_WIDTH, value, args);
cb(LV_STYLE_HEIGHT, value, args);
cb(LV_STYLE_WIDTH, value, L, type, args);
cb(LV_STYLE_HEIGHT, value, L, type, args);
break;

case LV_STYLE_PAD_ALL:
cb(LV_STYLE_PAD_TOP, value, args);
cb(LV_STYLE_PAD_BOTTOM, value, args);
cb(LV_STYLE_PAD_LEFT, value, args);
cb(LV_STYLE_PAD_RIGHT, value, args);
cb(LV_STYLE_PAD_TOP, value, L, type, args);
cb(LV_STYLE_PAD_BOTTOM, value, L, type, args);
cb(LV_STYLE_PAD_LEFT, value, L, type, args);
cb(LV_STYLE_PAD_RIGHT, value, L, type, args);
break;

case LV_STYLE_PAD_VER:
cb(LV_STYLE_PAD_TOP, value, args);
cb(LV_STYLE_PAD_BOTTOM, value, args);
cb(LV_STYLE_PAD_TOP, value, L, type, args);
cb(LV_STYLE_PAD_BOTTOM, value, L, type, args);
break;

case LV_STYLE_PAD_HOR:
cb(LV_STYLE_PAD_LEFT, value, args);
cb(LV_STYLE_PAD_RIGHT, value, args);
cb(LV_STYLE_PAD_LEFT, value, L, type, args);
cb(LV_STYLE_PAD_RIGHT, value, L, type, args);
break;

case LV_STYLE_PAD_GAP:
cb(LV_STYLE_PAD_ROW, value, args);
cb(LV_STYLE_PAD_COLUMN, value, args);
cb(LV_STYLE_PAD_ROW, value, L, type, args);
cb(LV_STYLE_PAD_COLUMN, value, L, type, args);
break;

/* pointers needs to build from lua stack table */
Expand All @@ -456,19 +470,19 @@ static int luavgl_set_style_kv(lua_State *L, style_set_cb_t cb, void *args)

/* layout styles that not constant */
case _LV_STYLE_FLEX_FLOW:
cb(LV_STYLE_FLEX_FLOW, value, args);
cb(LV_STYLE_FLEX_FLOW, value, L, type, args);
break;
case _LV_STYLE_FLEX_MAIN_PLACE:
cb(LV_STYLE_FLEX_MAIN_PLACE, value, args);
cb(LV_STYLE_FLEX_MAIN_PLACE, value, L, type, args);
break;
case _LV_STYLE_FLEX_CROSS_PLACE:
cb(LV_STYLE_FLEX_CROSS_PLACE, value, args);
cb(LV_STYLE_FLEX_CROSS_PLACE, value, L, type, args);
break;
case _LV_STYLE_FLEX_TRACK_PLACE:
cb(LV_STYLE_FLEX_TRACK_PLACE, value, args);
cb(LV_STYLE_FLEX_TRACK_PLACE, value, L, type, args);
break;
case _LV_STYLE_FLEX_GROW:
cb(LV_STYLE_FLEX_GROW, value, args);
cb(LV_STYLE_FLEX_GROW, value, L, type, args);
break;

case _LV_STYLE_FLEX: {
Expand All @@ -480,7 +494,7 @@ static int luavgl_set_style_kv(lua_State *L, style_set_cb_t cb, void *args)
break;
}
} else if ((prop & mask) <= LV_STYLE_LAST_BUILT_IN_PROP) {
cb(prop & mask, value, args);
cb(prop & mask, value, L, type, args);
} else {
return luaL_error(L, "unknown style");
}
Expand Down Expand Up @@ -609,9 +623,33 @@ struct obj_style_s {
};

static void obj_style_set_cb(lv_style_prop_t prop, lv_style_value_t value,
void *args)
lua_State *L, style_type_t type, void *args)
{
struct obj_style_s *info = args;
if (type == STYLE_TYPE_IMGSRC) {
if (lua_type(L, -1) == LUA_TSTRING) {
lua_pushlightuserdata(L, (void *)&style_imgsrc_key);
lua_rawget(L, LUA_REGISTRYINDEX);
lua_pushvalue(L, 1);
lua_rawget(L, -2);
if (lua_isnoneornil(L, -1)) {
lua_pop(L, 1);
lua_newtable(L);
}

lua_pushinteger(L, info->selector);
void *str = lua_newuserdata(L, lv_strlen(value.ptr) + 1);
lv_strcpy(str, value.ptr);
lua_rawset(L, -3);

lua_pushvalue(L, 1);
lua_pushvalue(L, -2);
lua_rawset(L, -4);
lua_pop(L, 2);

value.ptr = str;
}
}
lv_obj_set_local_style_prop(info->obj, prop, value, info->selector);
}

Expand Down Expand Up @@ -708,14 +746,18 @@ static int luavgl_obj_add_style(lua_State *L)
static int luavgl_obj_remove_style(lua_State *L)
{
lv_obj_t *obj = luavgl_to_obj(L, 1);
luavgl_style_t *s = luavgl_check_style(L, 2);

int selector = 0;
if (!lua_isnoneornil(L, 3)) {
selector = lua_tointeger(L, 3);
}

lv_obj_remove_style(obj, &s->style, selector);
if (lua_isnil(L, 2)) {
lv_obj_remove_style(obj, NULL, selector);
} else {
luavgl_style_t *s = luavgl_check_style(L, 2);
lv_obj_remove_style(obj, &s->style, selector);
}

lua_settop(L, 1);
return 1;
Expand Down Expand Up @@ -752,4 +794,12 @@ static void luavgl_style_init(lua_State *L)
lua_setfield(L, -2, "__index");

lua_pop(L, 1); /* pop __index table */

lua_pushlightuserdata(L, (void *)&style_imgsrc_key);
lua_newtable(L);
lua_newtable(L);
lua_pushstring(L, "k");
lua_setfield(L, -2, "__mode");
lua_setmetatable(L, -2);
lua_rawset(L, LUA_REGISTRYINDEX);
}