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

Fix handling state in ui::impl::button_base

Browse source
This commit is contained in:
Nikita Lisitsa 2024-07-30 23:51:28 +03:00
parent 7346aff9f6
commit 13862d8b47
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,9 +17,6 @@ namespace psemek::ui::impl
void update(button const & value); void update(button const & value);
private: private:
bool is_mouseover_ = false;
bool is_mousedown_ = false;
react::source<bool> mouseover_; react::source<bool> mouseover_;
react::source<bool> mousedown_; react::source<bool> mousedown_;
}; };

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

@ -11,28 +11,22 @@ namespace psemek::ui::impl
{ {
bool const mouseover = geom::contains(shape(), geom::cast<float>(event.position)); bool const mouseover = geom::contains(shape(), geom::cast<float>(event.position));
if (is_mouseover_ != mouseover) if (*mouseover_ != mouseover)
{ mouseover_.set(mouseover);
is_mouseover_ = mouseover;
mouseover_.set(is_mouseover_);
}
return is_mouseover_; return false;
} }
bool button_base::on_event(mouse_button_event const & event) bool button_base::on_event(mouse_button_event const & event)
{
if (is_mouseover_)
{ {
bool const mousedown = event.button == app::mouse_button::left && event.down; bool const mousedown = event.button == app::mouse_button::left && event.down;
if (is_mousedown_ != mousedown) if (*mouseover_ || !mousedown)
{ {
is_mousedown_ = mousedown; if (*mousedown_ != mousedown)
mousedown_.set(is_mousedown_); mousedown_.set(mousedown);
}
return true; return *mouseover_ && mousedown;
} }
return false; return false;