lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate mouseover state vs mouseover event in ui::button

Browse source
This commit is contained in:
Nikita Lisitsa 2024-08-09 15:17:11 +03:00
parent 84905b6f05
commit ddddfb67ce
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/ui/include/psemek/ui/button.hpp
View file

@ -10,6 +10,8 @@ namespace psemek::ui
{ {
react::source<bool> mouseover = {}; react::source<bool> mouseover = {};
react::source<bool> mousedown = {}; react::source<bool> mousedown = {};
react::source<bool> on_mouseover = {};
react::source<bool> on_mousedown = {};
}; };
} }

2
libs/ui/include/psemek/ui/impl/button_base.hpp
View file

@ -19,6 +19,8 @@ namespace psemek::ui::impl
private: private:
react::source<bool> mouseover_; react::source<bool> mouseover_;
react::source<bool> mousedown_; react::source<bool> mousedown_;
react::source<bool> on_mouseover_;
react::source<bool> on_mousedown_;
bool is_mouseover_ = false; bool is_mouseover_ = false;
bool is_mousedown_ = false; bool is_mousedown_ = false;

5
libs/ui/source/impl/button_base.cpp
View file

@ -15,6 +15,7 @@ namespace psemek::ui::impl
{ {
is_mouseover_ = mouseover; is_mouseover_ = mouseover;
mouseover_.set(is_mouseover_); mouseover_.set(is_mouseover_);
on_mouseover_.set(is_mouseover_);
} }
return false; return false;
@ -30,6 +31,7 @@ namespace psemek::ui::impl
{ {
is_mousedown_ = mousedown; is_mousedown_ = mousedown;
mousedown_.set(is_mousedown_); mousedown_.set(is_mousedown_);
on_mousedown_.set(is_mousedown_);
} }
return is_mouseover_ && is_mousedown_; return is_mouseover_ && is_mousedown_;
@ -43,6 +45,9 @@ namespace psemek::ui::impl
mouseover_ = value.mouseover; mouseover_ = value.mouseover;
mousedown_ = value.mousedown; mousedown_ = value.mousedown;
on_mouseover_ = value.on_mouseover;
on_mousedown_ = value.on_mousedown;
mouseover_.set(is_mouseover_); mouseover_.set(is_mouseover_);
mousedown_.set(is_mousedown_); mousedown_.set(is_mousedown_);
} }