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

UI: fix slider state after mouse button up

Browse source
This commit is contained in:
Nikita Lisitsa 2021-03-06 12:02:18 +03:00
parent 03acb43dc4
commit 05b50d2826
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@ namespace psemek::ui
int value_ = 0; int value_ = 0;
state_t state_ = state_t::normal; state_t state_ = state_t::normal;
std::optional<int> mouse_x_; std::optional<geom::point<int, 2>> mouse_;
on_value_changed_callback callback_; on_value_changed_callback callback_;

15
libs/ui/source/slider.cpp
View file

@ -6,7 +6,7 @@ namespace psemek::ui
bool slider::on_event(mouse_move const & e) bool slider::on_event(mouse_move const & e)
{ {
bool const over = shape().contains(geom::cast<float>(e.position)); bool const over = shape().contains(geom::cast<float>(e.position));
mouse_x_ = e.position[0]; mouse_ = e.position;
switch (state_) { switch (state_) {
case state_t::normal: case state_t::normal:
@ -24,8 +24,8 @@ namespace psemek::ui
} }
break; break;
case state_t::mousedown: case state_t::mousedown:
if (mouse_x_) if (mouse_)
set_value(compute_value(*mouse_x_)); set_value(compute_value((*mouse_)[0]));
break; break;
} }
@ -43,8 +43,8 @@ namespace psemek::ui
if (e.down) if (e.down)
{ {
state_ = state_t::mousedown; state_ = state_t::mousedown;
if (mouse_x_) if (mouse_)
set_value(compute_value(*mouse_x_)); set_value(compute_value((*mouse_)[0]));
on_state_changed(state_t::mouseover); on_state_changed(state_t::mouseover);
return true; return true;
} }
@ -52,7 +52,10 @@ namespace psemek::ui
case state_t::mousedown: case state_t::mousedown:
if (!e.down) if (!e.down)
{ {
state_ = state_t::mouseover; if (mouse_ && shape().contains(geom::cast<float>(*mouse_)))
state_ = state_t::mouseover;
else
state_ = state_t::normal;
on_state_changed(state_t::mousedown); on_state_changed(state_t::mousedown);
return true; return true;
} }