Skip to content
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

Fix luavgl obj property API #62

Merged
merged 4 commits into from
Aug 18, 2024
Merged

Fix luavgl obj property API #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72f42a3
util: add boolean property value support
XuNeo Aug 18, 2024
e3c2d3d
obj: fix property inherence confliction with lvgl's property
XuNeo Aug 18, 2024
d22c97d
examples: use new property API
XuNeo Aug 18, 2024
9468178
update lvgl to get property for specified class
XuNeo Aug 18, 2024
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
2 changes: 1 addition & 1 deletion deps/lvgl
Open in desktop
Submodule lvgl updated 203 files
37 changes: 15 additions & 22 deletions examples/flappyBird/flappyBird.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,19 @@ IMAGE_PATH = IMAGE_PATH .. "/flappyBird/"
print("IMAGE_PATH:", IMAGE_PATH)

local function randomY()
return math.random(TOP_Y + 30, BOTTOM_Y - 50 - 50)
return math.random(TOP_Y + 30, BOTTOM_Y - 100)
end

local function screenCreate(parent)
local property = {
w = 480,
h = 480,
bg_opa = 0,
w = lvgl.HOR_RES(),
h = lvgl.VER_RES(),
bg_opa = lvgl.OPA(0),
border_width = 0,
pad_all = 0
}

local scr
if parent then
scr = parent:Object{
w = 480,
h = 480,
bg_opa = 0,
border_width = 0,
pad_all = 0
}
else
scr = lvgl.Object(property)
end
local scr = lvgl.Object(parent, property)
scr:clear_flag(lvgl.FLAG.SCROLLABLE)
scr:clear_flag(lvgl.FLAG.CLICKABLE)
return scr
Expand Down Expand Up @@ -510,20 +499,25 @@ local function Background(root, bgEventCB)
end

local function SysLayer(root)
local sysLayer = screenCreate(root) -- upper layer
return sysLayer
return screenCreate(root) -- upper layer
end

local function createPlayBtn(sysLayer, onEvent)
local playBtn = Image(sysLayer, IMAGE_PATH .. "button_play.png").widget
playBtn:add_flag(lvgl.FLAG.CLICKABLE)
playBtn:set{
align = {
playBtn.align = {
type = lvgl.ALIGN.CENTER,
y_ofs = 80
}
}

playBtn.border_width = 0
playBtn.border_color = "#F00"
playBtn.parent.border_width = 1
playBtn.parent.border_color = "#0F0"
playBtn.align = {
type = lvgl.ALIGN.CENTER,
y_ofs = 80,
}
playBtn:onevent(lvgl.EVENT.PRESSED, onEvent)

return playBtn
Expand Down Expand Up @@ -615,7 +609,6 @@ local function entry()
align = {
type = lvgl.ALIGN.CENTER,
y_ofs = -20,
x_ofs = 0
}
}
scoreImg:Anim{
Expand Down
Loading