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

dasdasdasdas

Browse Source
This commit is contained in:
quflax
2023-12-27 15:01:18 +02:00
parent 95c713bc4d
commit 4d281ff03b
8 changed files with 64 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/gui/GUI.cpp
+4 -8
View File
@@ -40,10 +40,8 @@ PagesControl* GUI::getMenu() {
}
void GUI::actMouse(float delta) {
int mx = Events::x;
int my = Events::y;
auto hover = container->getAt(vec2(mx, my), nullptr);
auto hover = container->getAt(Events::cursor, nullptr);
if (this->hover && this->hover != hover) {
this->hover->hover(false);
}
@@ -58,7 +56,7 @@ void GUI::actMouse(float delta) {
if (Events::jclicked(0)) {
if (pressed == nullptr && this->hover) {
pressed = hover;
pressed->click(this, mx, my);
pressed->click(this, Events::cursor.x, Events::cursor.y);
if (focus && focus != pressed) {
focus->defocus();
}
@@ -72,7 +70,7 @@ void GUI::actMouse(float delta) {
focus = nullptr;
}
} else if (pressed) {
pressed->mouseRelease(this, mx, my);
pressed->mouseRelease(this, Events::cursor.x, Events::cursor.y);
pressed = nullptr;
}
}
@@ -100,9 +98,7 @@ void GUI::act(float delta) {
if (!Events::_cursor_locked) {
if (Events::clicked(mousecode::BUTTON_1)) {
int mx = Events::x;
int my = Events::y;
focus->mouseMove(this, mx, my);
focus->mouseMove(this, Events::cursor.x, Events::cursor.y);
}
if (prevfocus == focus){
for (int i = mousecode::BUTTON_1; i < mousecode::BUTTON_1+12; i++) {