fix(color): main view layout, lua widget display issues (#5382)
This commit is contained in:
@@ -79,23 +79,23 @@ class Layout: public LayoutBase
|
||||
}
|
||||
|
||||
virtual bool hasTopbar() const {
|
||||
return ((uint8_t*)(&getOptionValue(LAYOUT_OPTION_TOPBAR)->boolValue))[0];
|
||||
return getOptionValue(LAYOUT_OPTION_TOPBAR)->boolValue;
|
||||
}
|
||||
|
||||
virtual bool hasFlightMode() const {
|
||||
return ((uint8_t*)(&getOptionValue(LAYOUT_OPTION_FM)->boolValue))[0];
|
||||
return getOptionValue(LAYOUT_OPTION_FM)->boolValue;
|
||||
}
|
||||
|
||||
virtual bool hasSliders() const {
|
||||
return ((uint8_t*)(&getOptionValue(LAYOUT_OPTION_SLIDERS)->boolValue))[0];
|
||||
return getOptionValue(LAYOUT_OPTION_SLIDERS)->boolValue;
|
||||
}
|
||||
|
||||
virtual bool hasTrims() const {
|
||||
return ((uint8_t*)(&getOptionValue(LAYOUT_OPTION_TRIMS)->boolValue))[0];
|
||||
return getOptionValue(LAYOUT_OPTION_TRIMS)->boolValue;
|
||||
}
|
||||
|
||||
virtual bool isMirrored() const {
|
||||
return ((uint8_t*)(&getOptionValue(LAYOUT_OPTION_MIRRORED)->boolValue))[0];
|
||||
return getOptionValue(LAYOUT_OPTION_MIRRORED)->boolValue;
|
||||
}
|
||||
|
||||
virtual bool isAppMode() const { return false; }
|
||||
|
||||
@@ -97,7 +97,7 @@ void ViewMain::deleteLater(bool detach, bool trash)
|
||||
Window::deleteLater(detach, trash);
|
||||
}
|
||||
|
||||
void ViewMain::addMainView(Window* view, uint32_t viewId)
|
||||
void ViewMain::addMainView(WidgetsContainer* view, uint32_t viewId)
|
||||
{
|
||||
TRACE("addMainView(0x%p, %d)", view, viewId);
|
||||
|
||||
@@ -110,6 +110,9 @@ void ViewMain::addMainView(Window* view, uint32_t viewId)
|
||||
auto user_data = (void*)(intptr_t)viewId;
|
||||
lv_obj_add_event_cb(tile, tile_view_deleted_cb, LV_EVENT_CHILD_DELETED,
|
||||
user_data);
|
||||
|
||||
view->adjustLayout();
|
||||
view->show();
|
||||
}
|
||||
|
||||
void ViewMain::setTopbarVisible(float visible) { topbar->setVisible(visible); }
|
||||
|
||||
@@ -49,7 +49,7 @@ class ViewMain : public NavWindow
|
||||
std::string getName() const override { return "ViewMain"; }
|
||||
#endif
|
||||
|
||||
void addMainView(Window* view, uint32_t viewId);
|
||||
void addMainView(WidgetsContainer* view, uint32_t viewId);
|
||||
|
||||
void enableTopbar();
|
||||
void disableTopbar();
|
||||
|
||||
@@ -142,6 +142,8 @@ SetupWidgetsPage::SetupWidgetsPage(uint8_t customScreenIdx) :
|
||||
#if defined(HARDWARE_TOUCH)
|
||||
addBackButton();
|
||||
#endif
|
||||
|
||||
screen->show();
|
||||
}
|
||||
|
||||
void SetupWidgetsPage::onClicked()
|
||||
|
||||
Reference in New Issue
Block a user