Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #10987: Double-close of dropdown stopped land-info tool working as default. #11000

Merged
merged 1 commit into from
Jun 12, 2023

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Jun 12, 2023

Motivation / Problem

Clicking and releasing on the query toolbar icon is meant to select the land-info tool.

This did not work as during closing a window, OnFocusLost() is called, which then closes the window again. These two calls toggled the land-info tool one and off in the same action.

Description

Resolve by not calling Window::Close in OnFocusLost() if the window is already closing.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

…rking as default.

Clicking and releasing on the query toolbar icon is meant to select the land-info tool.

This did not work as during closing a window, OnFocusLost() is called, which then closes the window again. These two calls toggled the land-info tool one and off in the same action.

Resolve by not calling Window::Close in OnFocusLost() if the window is already closing.
@PeterN PeterN added the backport requested This PR should be backport to current release (RC / stable) label Jun 12, 2023
@LordAro
Copy link
Member

LordAro commented Jun 12, 2023

I wonder if there might be some scenario where there's a "window property" of "auto closes on losing focus", rather than it being manually done in the OnFocusLost function. Might be TMWFTLB

@PeterN
Copy link
Member Author

PeterN commented Jun 12, 2023

As there are only two windows that do it, and it would still need to track whether it is already closing, I don't think it would gain much.

@PeterN PeterN merged commit ebc451b into OpenTTD:master Jun 12, 2023
19 checks passed
@PeterN PeterN deleted the fix-double-close branch June 12, 2023 07:42
LordAro pushed a commit to LordAro/OpenTTD that referenced this pull request Jun 28, 2023
…rking as default. (OpenTTD#11000)

Clicking and releasing on the query toolbar icon is meant to select the land-info tool.

This did not work as during closing a window, OnFocusLost() is called, which then closes the window again. These two calls toggled the land-info tool one and off in the same action.

Resolve by not calling Window::Close in OnFocusLost() if the window is already closing.
LordAro pushed a commit that referenced this pull request Jun 28, 2023
…s default. (#11000)

Clicking and releasing on the query toolbar icon is meant to select the land-info tool.

This did not work as during closing a window, OnFocusLost() is called, which then closes the window again. These two calls toggled the land-info tool one and off in the same action.

Resolve by not calling Window::Close in OnFocusLost() if the window is already closing.
@LordAro LordAro added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Jun 28, 2023
mrmbernardi pushed a commit to mrmbernardi/OpenTTD that referenced this pull request Jul 2, 2023
…rking as default. (OpenTTD#11000)

Clicking and releasing on the query toolbar icon is meant to select the land-info tool.

This did not work as during closing a window, OnFocusLost() is called, which then closes the window again. These two calls toggled the land-info tool one and off in the same action.

Resolve by not calling Window::Close in OnFocusLost() if the window is already closing.
shoter pushed a commit to shoter/OpenTTD that referenced this pull request Jul 16, 2023
…rking as default. (OpenTTD#11000)

Clicking and releasing on the query toolbar icon is meant to select the land-info tool.

This did not work as during closing a window, OnFocusLost() is called, which then closes the window again. These two calls toggled the land-info tool one and off in the same action.

Resolve by not calling Window::Close in OnFocusLost() if the window is already closing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants