haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 23:21:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add arcs; push object when setting property

Browse source
This commit is contained in:
Felipe Martinez 2024-07-09 21:19:29 +00:00
parent 700e9a4f6d
commit 47522994f5
2 changed files with 68 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/displayapp/screens/ASM.cpp
View file

@ -193,6 +193,57 @@ void ASM::run() {
auto obj = pop<ValueLvglObject>(LvglObject);
lv_label_set_text(obj->obj, str->str);
push(obj);
break;
}
case OpcodeShort::SetArcRange: {
uint32_t max = pop_uint32();
uint32_t min = pop_uint32();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_arc_set_range(obj->obj, min, max);
push(obj);
break;
}
case OpcodeShort::SetArcRotation: {
uint32_t rot = pop_uint32();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_arc_set_rotation(obj->obj, rot);
push(obj);
break;
}
case OpcodeShort::SetArcBgAngles: {
uint32_t end = pop_uint32();
uint32_t start = pop_uint32();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_arc_set_bg_angles(obj->obj, start, end);
push(obj);
break;
}
case OpcodeShort::SetArcAdjustable: {
auto val = pop();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_arc_set_adjustable(obj->obj, val->isTruthy());
push(obj);
break;
}
case OpcodeShort::SetArcStartAngle: {
uint32_t angle = pop_uint32();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_arc_set_start_angle(obj->obj, angle);
push(obj);
break;
}
case OpcodeShort::SetArcValue: {
uint32_t value = pop_uint32();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_arc_set_value(obj->obj, value);
push(obj);
break;
}
@ -204,12 +255,17 @@ void ASM::run() {
push(std::make_shared<ValueLvglObject>(lv_btn_create(lv_scr_act(), NULL)));
break;
case OpcodeShort::CreateArc:
push(std::make_shared<ValueLvglObject>(lv_arc_create(lv_scr_act(), NULL)));
break;
case OpcodeShort::SetObjectAlign: {
int16_t y = pop_uint32();
int16_t x = pop_uint32();
uint8_t align = pop_uint32();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_obj_align(obj->obj, lv_scr_act(), align, x, y);
push(obj);
break;
}
@ -218,6 +274,7 @@ void ASM::run() {
int16_t w = pop_uint32();
auto obj = pop<ValueLvglObject>(LvglObject);
lv_obj_set_size(obj->obj, w, h);
push(obj);
break;
}
@ -225,6 +282,7 @@ void ASM::run() {
auto parent = pop<ValueLvglObject>(LvglObject);
auto child = pop<ValueLvglObject>(LvglObject);
lv_obj_set_parent(child->obj, parent->obj);
push(child);
break;
}
@ -255,6 +313,8 @@ void ASM::run() {
default:
break;
}
push(obj);
break;
}
@ -265,6 +325,7 @@ void ASM::run() {
lv_obj_set_user_data(obj->obj, cb);
lv_obj_set_event_cb(obj->obj, event_handler);
push(obj);
break;
}

7
src/displayapp/screens/ASM.h
View file

@ -156,7 +156,14 @@ namespace Pinetime {
CreateLabel,
CreateButton,
CreateArc,
SetLabelText,
SetArcRange,
SetArcRotation,
SetArcBgAngles,
SetArcAdjustable,
SetArcStartAngle,
SetArcValue,
SetObjectAlign,
SetObjectSize,
SetObjectParent,