Diffusion 0 A.D. Public Repository rP24667

Make the in-game menu go over the dev overlay.
rP24667
Actions

Description

Make the in-game menu go over the dev overlay.

There was a Z-conflict since the addition of the hotkeys button.

Patch by: ffffffff

Fixes #5928

Differential Revision: https://code.wildfiregames.com/D3393

Details

Auditors

vladislavbelov

Committed

wraitii

Jan 17 2021, 4:58 PM

Differential Revision

D3393: Ingame menu interfere with developer menu

Parents

rP24666: Fix some compilation issues on BSD

Branches

Unknown

Tags

Unknown

Build Status

Buildable 15164
Build 32902: Post-Commit Build	Jenkins
Build 32901: Post-Commit Build (macOS)	Jenkins

Event Timeline

wraitii committed rP24667: Make the in-game menu go over the dev overlay..Jan 17 2021, 4:58 PM

wraitii added an edge: D3393: Ingame menu interfere with developer menu.

Harbormaster failed to build B15164: rP24667: Make the in-game menu go over the dev overlay.!Jan 17 2021, 5:20 PM

Now menu goes over the menu button. That triggers tooltip blinking and a not really good text intersection.

This commit now has outstanding concerns.Jan 28 2021, 5:23 PM

wraitii mentioned this in D3494: Fix Z-fight in the menu.Jan 28 2021, 5:34 PM

wraitii mentioned this in D3386: Move DevOverlay down a bit to not hide 'exit'.Jan 29 2021, 2:32 PM

wraitii mentioned this in rP24825: Fix Z-fight in the menu.Feb 3 2021, 12:01 PM

wraitii requested verification of this commit.Feb 19 2021, 10:45 AM

This commit now requires verification by auditors.Feb 19 2021, 10:45 AM

vladislavbelov resigned from this commit.Jun 2 2021, 10:12 PM

This commit no longer requires audit.Jun 2 2021, 10:12 PM

Changes (1)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

gui/

session/

Menu.xml

rP24667

View Options

ps/trunk/binaries/data/mods/public/gui/session/Menu.xml