mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
remove pages loader from GUI class
This commit is contained in:
parent
1644751b1a
commit
37350a10be
3 changed files with 1 additions and 18 deletions
|
|
@ -178,7 +178,7 @@ void Engine::initialize(CoreParameters coreParameters) {
|
|||
scripting::initialize(this);
|
||||
|
||||
if (!isHeadless()) {
|
||||
gui->setPageLoader(scripting::create_page_loader());
|
||||
gui->getMenu()->setPageLoader(scripting::create_page_loader());
|
||||
}
|
||||
keepAlive(settings.ui.language.observe([this](auto lang) {
|
||||
langs::setup(lang, paths->resPaths.collectRoots());
|
||||
|
|
|
|||
|
|
@ -67,15 +67,6 @@ GUI::GUI(Engine& engine)
|
|||
|
||||
GUI::~GUI() = default;
|
||||
|
||||
void GUI::setPageLoader(PageLoaderFunc pageLoader) {
|
||||
this->pagesLoader = std::move(pageLoader);
|
||||
menu->setPageLoader(this->pagesLoader);
|
||||
}
|
||||
|
||||
PageLoaderFunc GUI::getPagesLoader() {
|
||||
return pagesLoader;
|
||||
}
|
||||
|
||||
std::shared_ptr<Menu> GUI::getMenu() {
|
||||
return menu;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,8 +62,6 @@ namespace gui {
|
|||
class Container;
|
||||
class Menu;
|
||||
|
||||
using PageLoaderFunc = std::function<std::shared_ptr<UINode>(const std::string&)>;
|
||||
|
||||
/// @brief The main UI controller
|
||||
class GUI {
|
||||
Engine& engine;
|
||||
|
|
@ -83,8 +81,6 @@ namespace gui {
|
|||
std::queue<runnable> postRunnables;
|
||||
std::vector<std::weak_ptr<UINode>> mouseOver;
|
||||
|
||||
PageLoaderFunc pagesLoader;
|
||||
|
||||
float tooltipTimer = 0.0f;
|
||||
float doubleClickTimer = 0.0f;
|
||||
float doubleClickDelay = 0.5f;
|
||||
|
|
@ -101,10 +97,6 @@ namespace gui {
|
|||
GUI(Engine& engine);
|
||||
~GUI();
|
||||
|
||||
void setPageLoader(PageLoaderFunc pageLoader);
|
||||
|
||||
PageLoaderFunc getPagesLoader();
|
||||
|
||||
/// @brief Get the main menu (Menu) node
|
||||
std::shared_ptr<Menu> getMenu();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue