mirror/MuditaOS
1
0
Fork 0
mirror of https://github.com/mudita/MuditaOS.git synced 2026-04-22 16:09:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

[EGD-6019] Revert of two commits

Browse Source 
This reverts commit b6416b15da.
This reverts commit e2f3882d8a.
This commit is contained in:
Przemysław Brudny
2021-05-14 08:55:01 +02:00
parent db8c1d35e5
commit e71a044bd3
45 changed files with 1162 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module-apps/Application.cpp
View File

@@ -102,7 +102,7 @@ namespace app
default_window(gui::name::window::main_window), windowsStack(this),
keyTranslator{std::make_unique<gui::KeyInputSimpleTranslation>()}, startInBackground{startInBackground},
callbackStorage{std::make_unique<CallbackStorage>()}, topBarManager{std::make_unique<TopBarManager>()},
settings(std::make_unique<settings::Settings>()), phoneMode{mode}, phoneLockSubject(this)
settings(std::make_unique<settings::Settings>(this)), phoneMode{mode}, phoneLockSubject(this)
{
topBarManager->enableIndicators({gui::top_bar::Indicator::Time});
using TimeMode = gui::top_bar::TimeConfiguration::TimeMode;
@@ -154,6 +154,7 @@ namespace app
Application::~Application() noexcept
{
windowsStack.windows.clear();
settings->unregisterValueChange();
}
Application::State Application::getState()
@@ -620,7 +621,6 @@ namespace app
{
setState(State::INITIALIZING);
settings->init(service::ServiceProxy(shared_from_this()));
app::manager::Controller::applicationInitialised(this, StartupStatus::Success, startInBackground);
if (startInBackground) {
@@ -638,7 +638,6 @@ namespace app
sys::ReturnCodes Application::DeinitHandler()
{
settings->deinit();
LOG_INFO("Closing an application: %s", GetName().c_str());
for (const auto &[windowName, window] : windowsStack) {