PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor: reduce Window references

Browse Source
This commit is contained in:
MihailRis
2025-04-02 14:55:53 +03:00
parent 896ab3597a
commit 74a94f869c
19 changed files with 151 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/ui/GUI.cpp
+5 -2
View File
@@ -115,8 +115,10 @@ void GUI::actMouse(float delta) {
}
if (hover) {
hover->setHover(true);
if (Events::scroll) {
hover->scrolled(Events::scroll);
int scroll = Events::getScroll();
if (scroll) {
hover->scrolled(scroll);
}
}
this->hover = hover;
@@ -229,6 +231,7 @@ void GUI::draw(const DrawContext& pctx, const Assets& assets) {
}
menu->setPos((wsize - menu->getSize()) / 2.0f);
uicamera->setFov(wsize.y);
uicamera->setAspectRatio(viewport.getRatio());
auto uishader = assets.get<Shader>("ui");
uishader->use();
src/graphics/ui/gui_util.cpp
+4 -4
View File
@@ -68,11 +68,11 @@ void guiutil::alert(
));
panel->refresh();
panel->keepAlive(Events::keyCallbacks[keycode::ENTER].add([on_hidden_final](){
panel->keepAlive(Events::addKeyCallback(keycode::ENTER, [on_hidden_final](){
on_hidden_final();
return true;
}));
panel->keepAlive(Events::keyCallbacks[keycode::ESCAPE].add([on_hidden_final](){
panel->keepAlive(Events::addKeyCallback(keycode::ESCAPE, [on_hidden_final](){
on_hidden_final();
return true;
}));
@@ -130,11 +130,11 @@ void guiutil::confirm(
}));
panel->add(subpanel);
panel->keepAlive(Events::keyCallbacks[keycode::ENTER].add([=](){
panel->keepAlive(Events::addKeyCallback(keycode::ENTER, [=](){
on_confirm_final();
return true;
}));
panel->keepAlive(Events::keyCallbacks[keycode::ESCAPE].add([=](){
panel->keepAlive(Events::addKeyCallback(keycode::ESCAPE, [=](){
on_deny_final();
return true;
}));