voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-12 14:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

remove pages loader from GUI class

Browse source
This commit is contained in:
MihailRis 2026-01-07 01:36:41 +03:00
parent 1644751b1a
commit 37350a10be
3 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/engine/Engine.cpp
View file

@ -178,7 +178,7 @@ void Engine::initialize(CoreParameters coreParameters) {
scripting::initialize(this); scripting::initialize(this);
if (!isHeadless()) { if (!isHeadless()) {
gui->setPageLoader(scripting::create_page_loader()); gui->getMenu()->setPageLoader(scripting::create_page_loader());
} }
keepAlive(settings.ui.language.observe([this](auto lang) { keepAlive(settings.ui.language.observe([this](auto lang) {
langs::setup(lang, paths->resPaths.collectRoots()); langs::setup(lang, paths->resPaths.collectRoots());

9
src/graphics/ui/GUI.cpp
View file

@ -67,15 +67,6 @@ GUI::GUI(Engine& engine)
GUI::~GUI() = default; 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() { std::shared_ptr<Menu> GUI::getMenu() {
return menu; return menu;
} }

8
src/graphics/ui/GUI.hpp
View file

@ -62,8 +62,6 @@ namespace gui {
class Container; class Container;
class Menu; class Menu;
using PageLoaderFunc = std::function<std::shared_ptr<UINode>(const std::string&)>;
/// @brief The main UI controller /// @brief The main UI controller
class GUI { class GUI {
Engine& engine; Engine& engine;
@ -83,8 +81,6 @@ namespace gui {
std::queue<runnable> postRunnables; std::queue<runnable> postRunnables;
std::vector<std::weak_ptr<UINode>> mouseOver; std::vector<std::weak_ptr<UINode>> mouseOver;
PageLoaderFunc pagesLoader;
float tooltipTimer = 0.0f; float tooltipTimer = 0.0f;
float doubleClickTimer = 0.0f; float doubleClickTimer = 0.0f;
float doubleClickDelay = 0.5f; float doubleClickDelay = 0.5f;
@ -101,10 +97,6 @@ namespace gui {
GUI(Engine& engine); GUI(Engine& engine);
~GUI(); ~GUI();
void setPageLoader(PageLoaderFunc pageLoader);
PageLoaderFunc getPagesLoader();
/// @brief Get the main menu (Menu) node /// @brief Get the main menu (Menu) node
std::shared_ptr<Menu> getMenu(); std::shared_ptr<Menu> getMenu();