morgan/OMOTE
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Fix bug in which OnShow was not being called when pages were pushed or when elements were added to existing page

Browse source
This commit is contained in:
MatthewColvin 2023-10-19 12:21:30 -05:00
parent 5a383629db
commit 8e5154fd83
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Platformio/OmoteUI/core/UIElement.cpp
View file

@ -38,6 +38,9 @@ UIElement *UIElement::AddElement(UIElement::Ptr anUIElement) {
auto lock = LvglResourceManager::GetInstance().scopeLock(); auto lock = LvglResourceManager::GetInstance().scopeLock();
lv_obj_set_parent(anUIElement->mLvglSelf, mLvglSelf); lv_obj_set_parent(anUIElement->mLvglSelf, mLvglSelf);
anUIElement->OnAdded(this); anUIElement->OnAdded(this);
if (IsVisible() && anUIElement->IsSetVisible()) {
anUIElement->OnShow();
}
mContainedElements.push_back(std::move(anUIElement)); mContainedElements.push_back(std::move(anUIElement));
return mContainedElements[mContainedElements.size() - 1].get(); return mContainedElements[mContainedElements.size() - 1].get();
} }
@ -314,7 +317,7 @@ void UIElement::OnHide() {
void UIElement::OnShow() { void UIElement::OnShow() {
for (auto &elem : mContainedElements) { for (auto &elem : mContainedElements) {
if (!lv_obj_has_flag(mLvglSelf, LV_OBJ_FLAG_HIDDEN)) { if (IsSetVisible()) {
elem->OnShow(); elem->OnShow();
} }
} }

2
Platformio/OmoteUI/core/screen/ScreenBase.cpp
View file

@ -7,7 +7,7 @@ Base::Base(ID aId) : UIElement(lv_obj_create(NULL), aId) {}
void Base::Show() { void Base::Show() {
lv_scr_load_anim(LvglSelf(), mPushAnimation, mTransitionAnimationTime, lv_scr_load_anim(LvglSelf(), mPushAnimation, mTransitionAnimationTime,
mTransitionDelayTime, false); mTransitionDelayTime, false);
UIElement::Show(); UIElement::OnShow();
} }
void Base::SetPushAnimation(lv_scr_load_anim_t aShowAnimation) { void Base::SetPushAnimation(lv_scr_load_anim_t aShowAnimation) {