More cleaning
This commit is contained in:
parent
02ebb9a54b
commit
6adc441e6f
37 changed files with 213 additions and 181 deletions
|
@ -1,12 +1,14 @@
|
|||
#include "DesktopManager.h"
|
||||
|
||||
#include "AbstractDesktopApp.h"
|
||||
|
||||
#include "FileLogger.h"
|
||||
|
||||
DesktopManager::DesktopManager()
|
||||
DesktopManager::DesktopManager(AbstractDesktopApp* application)
|
||||
: mScreens(),
|
||||
mWindowManager(WindowManager::Create()),
|
||||
mKeyboard(Keyboard::Create()),
|
||||
mMainApplication(),
|
||||
mUiApplication(application),
|
||||
mModified(false),
|
||||
mEventManager(EventManager::Create())
|
||||
{
|
||||
|
@ -18,9 +20,9 @@ DesktopManager::~DesktopManager()
|
|||
|
||||
}
|
||||
|
||||
std::unique_ptr<DesktopManager> DesktopManager::Create()
|
||||
std::unique_ptr<DesktopManager> DesktopManager::Create(AbstractDesktopApp* application)
|
||||
{
|
||||
return std::make_unique<DesktopManager>();
|
||||
return std::make_unique<DesktopManager>(application);
|
||||
}
|
||||
|
||||
void DesktopManager::ClearEvents()
|
||||
|
@ -100,14 +102,9 @@ void DesktopManager::SetKeyboard(KeyboardUPtr keyboard)
|
|||
mKeyboard = std::move(keyboard);
|
||||
}
|
||||
|
||||
void DesktopManager::SetMainApp(std::shared_ptr<AbstractApp> mainApp)
|
||||
AbstractApp* DesktopManager::getMainApp() const
|
||||
{
|
||||
mMainApplication = mainApp;
|
||||
}
|
||||
|
||||
AbstractApp* DesktopManager::GetMainApp()
|
||||
{
|
||||
return mMainApplication.get();
|
||||
return mUiApplication->getMainApplication();
|
||||
}
|
||||
|
||||
void DesktopManager::AddScreen(ScreenPtr screen)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue