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

Compute proper caret position after clicking on ui::edit

Browse source
This commit is contained in:
Nikita Lisitsa 2022-04-08 15:06:52 +03:00
parent 26631cd564
commit b9187c6b75
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/ui/include/psemek/ui/edit.hpp
View file

@ -84,6 +84,7 @@ namespace psemek::ui
bool editing_ = false; bool editing_ = false;
bool mouseover_ = false; bool mouseover_ = false;
std::optional<float> mouse_x_;
std::size_t caret_ = 0; std::size_t caret_ = 0;
float caret_blink_period_ = 0.5f; float caret_blink_period_ = 0.5f;

30
libs/ui/source/edit.cpp
View file

@ -90,7 +90,10 @@ namespace psemek::ui
bool edit::on_event(mouse_move const & e) bool edit::on_event(mouse_move const & e)
{ {
bool new_mouseover = shape_.contains(geom::cast<float>(e.position)); auto m = geom::cast<float>(e.position);
mouse_x_ = m[0];
bool new_mouseover = shape_.contains(m);
if (!mouseover_ && new_mouseover) if (!mouseover_ && new_mouseover)
sdl2::set_cursor(sdl2::cursor_type::beam); sdl2::set_cursor(sdl2::cursor_type::beam);
else if (mouseover_ && !new_mouseover) else if (mouseover_ && !new_mouseover)
@ -113,6 +116,31 @@ namespace psemek::ui
start_text_input(); start_text_input();
reset_caret(); reset_caret();
} }
if (cached_state_ && mouse_x_)
{
float x_offset = 0.f;
switch (halign_)
{
case halignment::left:
x_offset = text_box_[0].min;
break;
case halignment::center:
x_offset = text_box_[0].center() - cached_state_->size[0] * 0.5f;
break;
case halignment::right:
x_offset = text_box_[0].max - cached_state_->size[0];
break;
}
auto it = std::lower_bound(cached_state_->glyphs.begin(), cached_state_->glyphs.end(), *mouse_x_, [&](glyph const & g, float x){
return g.position[0].center() + x_offset < x;
});
caret_ = it - cached_state_->glyphs.begin();
}
return true; return true;
} }
else else