-
Notifications
You must be signed in to change notification settings - Fork 249
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
feat(port): UI, accessibility updates/updates, optimization updates/tweaks, keyboard format updates/tweaks #4636
Conversation
Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com>
Autofix has formatted code style violation in this PR. I edit commits locally (e.g: git, github desktop) and want to keep autofix
I do not want the automated commit
If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT. |
…aclysmbnteam/Cataclysm-BN into UIaccessibility_port_update3
Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
…aclysmbnteam/Cataclysm-BN into UIaccessibility_port_update3
You have to
Just delete the unused variable. |
Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
Got a hang-up while drinking water on a fresh save. I don't know if it's from this PR or another, but I can't OK this one until this issue is resolved. |
…aclysmbnteam/Cataclysm-BN into UIaccessibility_port_update3
So, I want to thank @Coolthulhu for having patience with me learning how to compile, how to build, how to debug game clearly, for helping to fix lots of errors that were present in initial state of this port, @olanti-p for his initial help with fixes, @OrenAudeles for building explanations, @AlecWhite for building explanations,@yay855 for great motivation, incredibly quick building, providing explanations of how to install libraries to be able to build, @Zlorthishen for great motivation, eagerness to build, so, I also want to thank Qrox who is the author of majority of pull requests in this port for his great accessibility work which gives all of us a great hope that video games along with games in general can be accessible to all of us hopefully as well |
Wait why was this approved before the other two PRs if it's dependant on them and why did it pass all tests on its own aaaahhh EDIT: Evidently the reason is the first 2 PRs are technically redundant so it wasn't as bad as I thought it'd be but ugh |
This reverts commit db18424.
This reverts commit db18424.
* Port UI, accessibility updates, tweaks Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update * Misc tweaks update * Misc tweaks update Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update --------- Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
* Port UI, accessibility updates, tweaks * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update * Misc tweaks update * Misc tweaks update Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update --------- Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> [ui] Properly render control characters in keybindings list (#54350) fix Merge pull request #57361 from Qrox/ui-fixes Some UI fixes Merge pull request #59035 from Qrox/cursor Allow setting terminal cursor for screen readers and IME preview using ui_adaptor Display vehicle interaction UI keybindings according to settings (#47229) Info panel fixes and adding scrollbars (#50892) Change item list highlight color to white (#51447) * Change item list highlight color to white * Position the cursor on the selected item in the item list [Not done in this port, cause based on the PR discussion after the merge, it doesn't work] Merge pull request #58609 from ZeroInternalReflection/CraftingFilterSmallWindowFix Allow scrolling of string_input_popup descriptions Merge pull request #47585 from Qrox/crafting-gui-recp-info Implement scrolling for recipe info in crafting gui Merge pull request #47584 from Qrox/crafting-gui-keybind Display actual bound keys in crafting gui Merge pull request #57266 from Qrox/string-input-context Allow customization of text input UI hotkeys Add max length to worldname input length (#55152) Made a constant to manage this attribute so it is easy to change if the current max is deemed too short in the future. fixes #55148 Merge pull request #46796 from Qrox/string-input-popup Fix cursor movement of string input popup Merge pull request #56212 from Qrox/queue Properly fix conflicting `uilist` keys Merge pull request #47263 from Qrox/paste Allow pasting into input popup on tiles build Merge pull request #40961 from ZhilkinSerg/sa-2020-05-29 Code optimizations reported by static code analysis (2020-05-29) Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
* Port UI, accessibility updates, tweaks * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update * Misc tweaks update * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update --------- Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> [ui] Properly render control characters in keybindings list (#54350) fix Merge pull request #57361 from Qrox/ui-fixes Some UI fixes Merge pull request #59035 from Qrox/cursor Allow setting terminal cursor for screen readers and IME preview using ui_adaptor Display vehicle interaction UI keybindings according to settings (#47229) Info panel fixes and adding scrollbars (#50892) Change item list highlight color to white (#51447) * Change item list highlight color to white * Position the cursor on the selected item in the item list [Not done in this port, cause based on the PR discussion after the merge, it doesn't work] Merge pull request #58609 from ZeroInternalReflection/CraftingFilterSmallWindowFix Allow scrolling of string_input_popup descriptions Merge pull request #47585 from Qrox/crafting-gui-recp-info Implement scrolling for recipe info in crafting gui Merge pull request #47584 from Qrox/crafting-gui-keybind Display actual bound keys in crafting gui Merge pull request #57266 from Qrox/string-input-context Allow customization of text input UI hotkeys Add max length to worldname input length (#55152) Made a constant to manage this attribute so it is easy to change if the current max is deemed too short in the future. fixes #55148 Merge pull request #46796 from Qrox/string-input-popup Fix cursor movement of string input popup Merge pull request #56212 from Qrox/queue Properly fix conflicting `uilist` keys Merge pull request #47263 from Qrox/paste Allow pasting into input popup on tiles build Merge pull request #40961 from ZhilkinSerg/sa-2020-05-29 Code optimizations reported by static code analysis (2020-05-29) Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> style(autofix.ci): automated formatting Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> Co-Authored-By: Kenan Mamedov <43505148+Kenan2000@users.noreply.github.com>
* feat(port): UI, accessibility updates, tweaks (#4636) * Port UI, accessibility updates, tweaks * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update * Misc tweaks update * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * style(autofix.ci): automated formatting * Misc tweaks update * Misc tweaks update --------- Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> [ui] Properly render control characters in keybindings list (#54350) fix Merge pull request #57361 from Qrox/ui-fixes Some UI fixes Merge pull request #59035 from Qrox/cursor Allow setting terminal cursor for screen readers and IME preview using ui_adaptor Display vehicle interaction UI keybindings according to settings (#47229) Info panel fixes and adding scrollbars (#50892) Change item list highlight color to white (#51447) * Change item list highlight color to white * Position the cursor on the selected item in the item list [Not done in this port, cause based on the PR discussion after the merge, it doesn't work] Merge pull request #58609 from ZeroInternalReflection/CraftingFilterSmallWindowFix Allow scrolling of string_input_popup descriptions Merge pull request #47585 from Qrox/crafting-gui-recp-info Implement scrolling for recipe info in crafting gui Merge pull request #47584 from Qrox/crafting-gui-keybind Display actual bound keys in crafting gui Merge pull request #57266 from Qrox/string-input-context Allow customization of text input UI hotkeys Add max length to worldname input length (#55152) Made a constant to manage this attribute so it is easy to change if the current max is deemed too short in the future. fixes #55148 Merge pull request #46796 from Qrox/string-input-popup Fix cursor movement of string input popup Merge pull request #56212 from Qrox/queue Properly fix conflicting `uilist` keys Merge pull request #47263 from Qrox/paste Allow pasting into input popup on tiles build Merge pull request #40961 from ZhilkinSerg/sa-2020-05-29 Code optimizations reported by static code analysis (2020-05-29) Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> style(autofix.ci): automated formatting Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> Co-Authored-By: Kenan Mamedov <43505148+Kenan2000@users.noreply.github.com> * Update Keybinds Delete key now properly shows up and is usable. Remove KEYPAD_ENTER which doesn't seem to do anything. * style(autofix.ci): automated formatting * Add check in keybind loading for NULL input cases They'll now throw an error instead of loading silently as Ctrl + @ --------- Co-authored-by: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> Co-authored-by: Rob Kuijper <robkuijper@live.nl> Co-authored-by: Brambor <13402666+Brambor@users.noreply.github.com> Co-authored-by: eltank <8000047+eltank@users.noreply.github.com> Co-authored-by: David Seguin <davidseguin@live.ca> Co-authored-by: ZeroInternalReflection <89038572+zerointernalreflection@users.noreply.github.com> Co-authored-by: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-authored-by: Mark Langsdorf <mlangsdo@redhat.com> Co-authored-by: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Olanti <olanti-p@yandex.ru> Co-authored-by: Coolthulhu <Coolthulhu@gmail.com> Co-authored-by: Kenan Mamedov <43505148+Kenan2000@users.noreply.github.com>
Ports these pull requests
CleverRaven/Cataclysm-DDA#40961,
CleverRaven/Cataclysm-DDA#41866,
CleverRaven/Cataclysm-DDA#47263,
CleverRaven/Cataclysm-DDA#56212,
CleverRaven/Cataclysm-DDA#46796,
CleverRaven/Cataclysm-DDA#55152,
CleverRaven/Cataclysm-DDA#57266,
CleverRaven/Cataclysm-DDA#47584,
CleverRaven/Cataclysm-DDA#47585,
CleverRaven/Cataclysm-DDA#58609,
CleverRaven/Cataclysm-DDA#51447,
CleverRaven/Cataclysm-DDA#59035,
CleverRaven/Cataclysm-DDA#50892,
CleverRaven/Cataclysm-DDA#41605,
CleverRaven/Cataclysm-DDA#47229,
CleverRaven/Cataclysm-DDA#57361,
This also includes pull requests #4627, #4623 by @chaosvolt for easier mergeability. This depends on #4634, #4635, so it cannot be merged until these are merged
Though, pull requests
CleverRaven/Cataclysm-DDA#53069,
CleverRaven/Cataclysm-DDA#65767,
CleverRaven/Cataclysm-DDA#67847, were initially ported but they were reverted because of errors essentially
So all of errors have been fixed thanks to help of @Coolthulhu, game has been compiled, built, debugged, thanks to explanations of how to do that made by Coolthulhu, @olanti-p, @OrenAudeles, @AlecWhite, @yay855, it works correctly
Coauthors have been linked properly via GitHub Desktop built-in function to do this work hopefully