-
Notifications
You must be signed in to change notification settings - Fork 276
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add desc_lines_setup for repeatable setup of uilist * Remove unused MENU_WIDTH_ENTRIES * Add setup callbacks of uilist dimensional parameters for repeatable setup * Use setup callbacks in color.cpp * Use setup callbacks in editmap.cpp * Use setup callbacks in game.cpp * Use setup callbacks in magic.cpp * Use setup callbacks in string_input_popup.cpp * Use setup callbacks in wish.cpp * Fix skill editor menu closing when selecting skill to modify
Not sure if I tested them all out correctly, that's a lot of menus. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Over
m
ap viewerCleverRaven#40094
i
nventory; various menus likee
at ora
ctivate. 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