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

Finish ui_adaptor migration (part 1) #194

Merged
merged 17 commits into from
Nov 7, 2020
Merged

Finish ui_adaptor migration (part 1) #194

merged 17 commits into from
Nov 7, 2020

Conversation

olanti-p
Copy link
Contributor

@olanti-p olanti-p commented Nov 6, 2020

Summary

SUMMARY: Interface "Port ui_adaptor-related changes from DDA for cleaner UI behavior"

Purpose of change

Finish migration of game UIs to ui_adaptor for correct behavior when resizing game window / redrawing parts of game window / redrawing UI when higher layer (e.g. a confirmation popup) has been closed.

Describe the solution

Cherry-picked, almost without changes, following PRs:

CleverRaven#40346
Many menus, e.g. debug wish for item

CleverRaven#40095
CleverRaven#40375
Overmap viewer

CleverRaven#40094
inventory; various menus like eat or activate. Removed a single function for nested containers: it does not even exist in BN, and was failing to compile.

CleverRaven#40384
Message log UI [P].
NPC trade UI. Had a conflict with #183, re-implemented that as a separate commit.

CleverRaven#40430
debug map editor

CleverRaven#40438
Inventory item menu [i -> select item]
Achievements / scores / kills UI [) key]
Armor sorting menu [+ key]

Describe alternatives you've considered

Testing

These changes were made shortly after BN was forked; there were no substantial merge conflicts, and I didn't find any mentions of any regressions (except that overmap_ui flickering thing), so I assume the changes will work out of the box.

Briefly went through changed menus to make sure resizing game window actually resizes those menus.

Found a kink in the overmap viewer: at a specific game window dimensions, there is a thin gap between overmap view & overmap legend - the sidebar is visible through that gap. That's a minor thing though, and might be fixed in one of the following ui_adaptor changes (if not, I'll look into it later - seems like an easy fix).

Additional context

@Coolthulhu Coolthulhu merged commit 04a4a08 into cataclysmbnteam:upload Nov 7, 2020
@Coolthulhu
Copy link
Member

Not sure if I tested them all out correctly, that's a lot of menus.
Those I tested look fine.

@olanti-p olanti-p deleted the migrate-ui branch November 7, 2020 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants