fix(ui): Superfluous and invalid attribute initialisation (#2747)

* fix(ui): fixed a memopry leak and a waring in topbar.cpp
* fix: Restore ScreenMenu on exit of topbar widget setup
This commit is contained in:
Malte Langermann
2022-11-23 16:04:01 +10:00
committed by GitHub
parent ab26bf3c66
commit 328fba76b4
2 changed files with 1 additions and 5 deletions
+1 -2
View File
@@ -35,8 +35,7 @@ Topbar * TopbarFactory::create(Window * parent)
}
SetupTopBarWidgetsPage::SetupTopBarWidgetsPage():
FormWindow(ViewMain::instance(), rect_t{}, FORM_FORWARD_FOCUS),
menu(menu)
FormWindow(ViewMain::instance(), rect_t{}, FORM_FORWARD_FOCUS)
{
// remember focus
Layer::push(this);
-3
View File
@@ -54,7 +54,4 @@ class SetupTopBarWidgetsPage : public FormWindow
void onClicked() override;
void onCancel() override;
void deleteLater(bool detach = true, bool trash = true) override;
protected:
ScreenMenu* menu;
};