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

GUI2/Listbox: fully show any partially-obscured items when selected

Browse source
This commit is contained in:
Charles Dang 2017-11-03 14:57:03 +11:00
parent feccf66231
commit 9902b07519
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/widgets/listbox.cpp
View file

@ -33,6 +33,7 @@
#include "gui/widgets/viewport.hpp" #include "gui/widgets/viewport.hpp"
#include "gui/widgets/widget_helpers.hpp" #include "gui/widgets/widget_helpers.hpp"
#include "gui/widgets/window.hpp" #include "gui/widgets/window.hpp"
#include "sdl/rect.hpp"
#include "utils/functional.hpp" #include "utils/functional.hpp"
#include <boost/optional.hpp> #include <boost/optional.hpp>
@ -301,11 +302,19 @@ void listbox::list_item_clicked(widget& caller)
#endif #endif
fire(event::NOTIFY_MODIFIED, *this, nullptr); fire(event::NOTIFY_MODIFIED, *this, nullptr);
return; break;
} }
} }
assert(false); const SDL_Rect& visible = content_visible_area();
SDL_Rect rect = generator_->item(generator_->get_selected_item()).get_rectangle();
if(sdl::rects_overlap(visible, rect)) {
rect.x = visible.x;
rect.w = visible.w;
show_content_rect(rect);
}
} }
void listbox::set_self_active(const bool /*active*/) void listbox::set_self_active(const bool /*active*/)