widelands-dev team mailing list archive

[Notabilis <notabilis27@xxxxxx>]

Thanks for the reviews.

So you will test this some more? Feel free to merge once you are satisfied.

Diff comments:

> === modified file 'src/ui_basic/panel.cc'
> --- src/ui_basic/panel.cc	2018-05-07 05:35:32 +0000
> +++ src/ui_basic/panel.cc	2018-05-13 08:07:57 +0000
> @@ -664,8 +664,6 @@
>  	if (!parent_ || this == modal_) {
>  		return;
>  	}
> -	if (parent_->focus_ == this)
> -		return;

I think it can lead to endless recursion, yes. But if we created such a hierarchy, we deserve the loop. ;)
(Besides: I guess it will then break in other places, too.)

>  
>  	parent_->focus_ = this;
>  	parent_->focus(false);
> 
> === modified file 'src/wui/load_or_save_game.cc'
> --- src/wui/load_or_save_game.cc	2018-05-13 07:15:39 +0000
> +++ src/wui/load_or_save_game.cc	2018-05-13 08:07:57 +0000
> @@ -268,6 +268,7 @@
>  		   ngettext("Confirm Deleting File", "Confirm Deleting Files", no_selections), message,
>  		   UI::WLMessageBox::MBoxType::kOkCancel);
>  		do_delete = confirmationBox.run<UI::Panel::Returncodes>() == UI::Panel::Returncodes::kOk;
> +		table_.focus();

Its not that odd. The line here is required so the table is focused again. The line above makes sure the focusing works right.

>  	}
>  	if (do_delete) {
>  		for (const uint32_t index : selections) {


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-keyboard-after-save-delete/+merge/345469
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-keyboard-after-save-delete.