mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-05 11:01:49 +00:00
small fix
This commit is contained in:
parent
1cc26a6b10
commit
fe5cab0db0
3 changed files with 11 additions and 11 deletions
|
|
@ -40,7 +40,6 @@ PagesControl* GUI::getMenu() {
|
|||
}
|
||||
|
||||
void GUI::actMouse(float delta) {
|
||||
|
||||
auto hover = container->getAt(Events::cursor, nullptr);
|
||||
if (this->hover && this->hover != hover) {
|
||||
this->hover->hover(false);
|
||||
|
|
@ -53,7 +52,7 @@ void GUI::actMouse(float delta) {
|
|||
}
|
||||
this->hover = hover;
|
||||
|
||||
if (Events::jclicked(0)) {
|
||||
if (Events::jclicked(mousecode::BUTTON_1)) {
|
||||
if (pressed == nullptr && this->hover) {
|
||||
pressed = hover;
|
||||
pressed->click(this, Events::cursor.x, Events::cursor.y);
|
||||
|
|
@ -73,6 +72,14 @@ void GUI::actMouse(float delta) {
|
|||
pressed->mouseRelease(this, Events::cursor.x, Events::cursor.y);
|
||||
pressed = nullptr;
|
||||
}
|
||||
|
||||
if (hover) {
|
||||
for (int i = mousecode::BUTTON_1; i < mousecode::BUTTON_1+12; i++) {
|
||||
if (Events::jclicked(i)) {
|
||||
hover->clicked(this, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GUI::act(float delta) {
|
||||
|
|
@ -100,13 +107,6 @@ void GUI::act(float delta) {
|
|||
if (Events::clicked(mousecode::BUTTON_1)) {
|
||||
focus->mouseMove(this, Events::cursor.x, Events::cursor.y);
|
||||
}
|
||||
if (prevfocus == focus){
|
||||
for (int i = mousecode::BUTTON_1; i < mousecode::BUTTON_1+12; i++) {
|
||||
if (Events::jclicked(i)) {
|
||||
focus->clicked(this, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue