monoid wrote:

Here's an attempt at cleaning up the window z-ordering code, along with making the save/load window to be handled using this new z-ordering prioritization code.

Attachments

• zordering.diff (2.89 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10158

monoid wrote:

Fixed up whitespace.

Attachments

• zordering.diff (2.83 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10159

Alberth wrote:

Nice for a first try.

This cannot be complete however, there is also the big main view window that must stay at the bottom.
The console window also seems to be missing.

Code-wise:
- the new function needs a doxygen comment. In particular, it should explain what 'high priority' means in the window stack.
- There should be an empty line between alternatives in a switch.
- "/* Bring the window just below the prioritized windows */" does not seem to be exactly right, if a high priority window like the endscreen is opened
- the 'w = w->z_back;' statement in the last change must either be put at the same line as the while, or you must use curly braces (coding style does not allow such multi-line statements).

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10160

monoid wrote:

Version 2.

This doesn't change the z-priority of the console window compared to what the current trunk does; should it?

Attachments

• zordering2.diff (3.51 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10163

monoid wrote:

Version 3. Adds more windows to their own z-priorities, and fixes some comments.

Attachments

• zordering3.diff (4.79 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10165

monoid wrote:

Version 4.

* Adds console window to its own z-priority layer
* Fixes WC_INVALID'd windows causing new/brought-to-top windows to be incorrectly placed in the z-ordering, and added assertions to check for this happening in future
* Comment tidyup

Attachments

• zordering4.diff (5.15 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10170

Alberth wrote:

Not one new version but three :)
Nice progress.

The window class I found missing in the priority list was the error message window. I don't know whether you considered that window already.
The other candidates would be the edit box and the osk window. However, I dismissed those as 'not interesting enough'.
(I can imagine a popup of an edit-box, and then a user needing to open some other window to find out what to type. Such actions should be possible imho.)

The second biggest issue is a bit of re-ordering of the window-insert code to improve readability and remove the dead code.

The other remarks are just minor issues that can be fixed very quickly. See the attached file.

Attachments

• zordering4_comments.txt (3.00 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10173

monoid wrote:

Thanks for your comments Alberth; I'm still getting used to the OpenTTD coding style :P

I've taken all your advice, and done some more cleanup.

Attachments

• zordering5.diff (8.00 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10256

monoid wrote:

Fixed comment typo, added more z-priorities, removed literal priority values.

Attachments

• zordering6.diff (8.15 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709#comment10275

Rubidium closed the ticket.

Reason for closing: Fixed

In r23336. Thanks for the patch monoid.

This comment was imported from FlySpray: https://bugs.openttd.org/task/4709