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

More detailed explanation of the workaround added in 6c2e2e9bf7

Browse source
This commit is contained in:
Charles Dang 2016-09-28 12:29:59 +11:00
parent 6c2e2e9bf7
commit 5f043a79f1
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/dialogs/drop_down_list.cpp
View file

@ -33,14 +33,19 @@ REGISTER_DIALOG(drop_down_list)
namespace {
void click_callback(twindow& window, bool&, bool&, tpoint coordinate)
{
// By deselecting any selected row here, we remove the possibility that the click actually deselects the row
// and results in selected_item_ being set to -1.
// It works because this handler is called *before* the listbox's click handler.
/* FIXME: This dialog uses a listbox with 'has_minimum = false'. This allows a listbox to have 0 or more selections,
* and selecting the same entry toggles that entry's state (ie, if it was selected, it will be deselected). Because
* of this, selecting the same entry in the dropdown list essentilly sets the list's selected row to -1, causing problems.
*
* In order to work around this, we first manually deselect the selected entry here. This handler is called *before*
* the listbox's click handler, and as such the selected item will remain toggled on when the click handler fires.
*/
tlistbox& list = find_widget<tlistbox>(&window, "list", true);
int sel = list.get_selected_row();
const int sel = list.get_selected_row();
if(sel >= 0) {
list.select_row(sel, false);
}
SDL_Rect rect = window.get_rectangle();
if(coordinate.x < rect.x || coordinate.x > rect.x + rect.w || coordinate.y < rect.y || coordinate.y > rect.y + rect.h ) {
window.set_retval(twindow::CANCEL);