0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gui1: Implement I-beam cursor for GUI1 textboxes

Browse source
This commit is contained in:
Iris Morelle 2019-11-13 01:43:15 -03:00
parent c31047af47
commit d17938d9ca
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/widgets/textbox.cpp
View file

@ -16,6 +16,7 @@
#include "widgets/textbox.hpp" #include "widgets/textbox.hpp"
#include "cursor.hpp"
#include "desktop/clipboard.hpp" #include "desktop/clipboard.hpp"
#include "font/sdl_ttf.hpp" #include "font/sdl_ttf.hpp"
#include "log.hpp" #include "log.hpp"
@ -48,6 +49,10 @@ textbox::textbox(CVideo &video, int width, const std::string& text, bool editabl
textbox::~textbox() textbox::~textbox()
{ {
// Restore the cursor on destruction if we (probably) set it to IBEAM
if(cursor::get() == cursor::IBEAM) {
cursor::set(cursor::NORMAL);
}
} }
void textbox::update_location(const SDL_Rect& rect) void textbox::update_location(const SDL_Rect& rect)
@ -652,9 +657,22 @@ void textbox::handle_event(const SDL_Event& event, bool was_forwarded)
} }
const SDL_Rect& loc = inner_location(); const SDL_Rect& loc = inner_location();
const bool mouse_inside = sdl::point_in_rect(mousex, mousey, loc);
// Someone else may set the mouse cursor for us to something unusual (e.g.
// the WAIT cursor) so we ought to mess with that only if it's set to
// NORMAL or IBEAM.
if(mouse_inside && cursor::get() == cursor::NORMAL) {
cursor::set(cursor::IBEAM);
} else if(!mouse_inside && cursor::get() == cursor::IBEAM) {
cursor::set(cursor::NORMAL);
}
bool clicked_inside = !mouse_locked() && (event.type == SDL_MOUSEBUTTONDOWN bool clicked_inside = !mouse_locked() && (event.type == SDL_MOUSEBUTTONDOWN
&& (mousebuttons & SDL_BUTTON(1)) && (mousebuttons & SDL_BUTTON(1))
&& sdl::point_in_rect(mousex, mousey, loc)); && mouse_inside);
if(clicked_inside) { if(clicked_inside) {
set_focus(true); set_focus(true);
} }