Reverts reversion: tgui will 516 or else #82527
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
tgstation-server
added
UI
|
surely THIS time,,,,, |
6 tasks
github-merge-queue bot
pushed a commit
to cmss13-devs/cmss13
that referenced
this pull request
May 19, 2024
# About the pull request This PR is a follow up to #5493 and ultimately is aimed at bringing us back into parity with TG's version of the TGUI components again. For the most part this PR is done via diffing TG's TGUI folder with ours. The PRs listed below are what I found in blames and I double checked to see what files if any they affected outside the TGUI folder. **It is recommended to close VSC and run bin/clean.cmd and then bin/build.cmd if you try out this branch**. You will be using the wrong node & prettier version otherwise. This at least partially ports these PRs (and likely many others - but these I explicitly checked for how they affected other files): - tgstation/tgstation#67935 - tgstation/tgstation#74638 - tgstation/tgstation#75029 - tgstation/tgstation#75431 - tgstation/tgstation#75463 - tgstation/tgstation#75534 - tgstation/tgstation#78879 - tgstation/tgstation#79322 - tgstation/tgstation#79895 - tgstation/tgstation#79898 - tgstation/tgstation#79974 - tgstation/tgstation#79991 - tgstation/tgstation#80044 - tgstation/tgstation#80057 - tgstation/tgstation#80189 - tgstation/tgstation#80304 - tgstation/tgstation#80430 - tgstation/tgstation#80453 - tgstation/tgstation#80454 - tgstation/tgstation#80920 - tgstation/tgstation#81354 - tgstation/tgstation#81381 - tgstation/tgstation#81495 - tgstation/tgstation#82334 - tgstation/tgstation#82377 - tgstation/tgstation#82385 - tgstation/tgstation#82417 - tgstation/tgstation#82420 - tgstation/tgstation#82527 - tgstation/tgstation#82571 - tgstation/tgstation#82792 - tgstation/tgstation#82854 - tgstation/tgstation#83098 - tgstation/tgstation#83096 - tgstation/tgstation#83218 Additionally it ports the new base components from: - tgstation/tgstation#71531 - tgstation/tgstation#71847 - tgstation/tgstation#74544 - tgstation/tgstation#74704 (just a fix to above) - tgstation/tgstation#80743 - tgstation/tgstation#82181 (just a fix to above) - tgstation/tgstation#82533 - tgstation/tgstation#83179 (just a fix to above) But these are missing documentation in the components readme, and we do not have any interface that utilizes them yet. I wanted to explicitly mention them separately so people can see what they can do. Changes I still intend to do in this PR or investigate: - [X] Fix Button.Confirm not properly handling clicks (Sort of stumped on this atm) - [X] Fix Relay Viewer buttons not always updating - [X] Port TGSay 1.1 & TextArea changes (tgstation/tgstation#75431) - [X] Fix ByondUI in Drop pod panel - [X] Check parity with TG again and port anything else that may have been done during the creation of this PR - [X] Find a way to prevent TGSay passthrough when hotkeying InputList (and maybe others)? tgstation/tgstation#75463 Other notable changes not directly related to the above ports, but done as I was fixing other problems: - Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same. - VOX panel's second tab now doesn't overlap the other buttons - Wiring panel from #1623 is now restored to use circular indicators again instead of the regression to ColorBox in #2641 - Smart fridge interface is more in line with sorted inventories as far as layout & tooltips - Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date) - Fixes runtimes when quickly switching between tgsay categories - Basically reverts #5651 in favor of how TG ended up solving it via tgstation/tgstation#81495 - Rolls back SWC to the version TG is currently using because of #6196 (comment) - Adds these commands from tgstation/tgstation#81381 though I also have it check jsx files that somereason TG doesn't do (needs to have been built once to function - just run build.bat):  - Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity. I left out one of the Cyrillic fixes since we shouldn't normally be handling Cyrillic anyways. - Ship manipulator window can now replace any existing shuttle and generally is polished up more than it was. - Ports TGSay 1.1 though I discarded basically all the layout changes they did. - TGUI modals can now accept a ui_state in case you want an alert for say a mob that might qdel while it is open. - Finishes porting the reservation changes to shuttles.dm from tgstation/tgstation#73261 that some reason were absent from #5165 - Fixes F5 refreshing a window if default is prevented (e.g. when the hotkey interface is waiting for a key press). - All depreciated useLocalState is now removed. In almost all situations I could useState, but a few things for MFD on CAS I needed to use sharedState. # Explain why it's good for the game Prepares us for 516 (though still more changes will be necessary) and finalizes the react port. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> New list modal w/ duplicate key handling:  Fixed VOX panel (sound files used to overlap type select):  Updated shuttle manipulator window:    With replace any shuttle support:  Erase current tab chat history:  Working case sensitivity highlights:  Unread counter toggle per tab:  Larger strip panel:  Tacmap panel polish (button positioning + dropdown text color when highlighted):  Minor tweak to camera panel:  Dropdowns will now display above if too little space below:  Kitchen sink works again (F12 w/ tgui-dev):  Layout mode works again (F11 w/ tgui-dev):  New checkbox modal (with theme support):   New handling for button sizes in alert modals (stacked list since options wanted to use more horizontal space than limit):  Polished smart fridge + restore wiring panel:  Fixed byondui in supply pod menu:  TG Say:  Some unchanged panels (to just show working):                         </details> # Changelog :cl: Drathek, mullenpaul ui: Finalizes the TGUI React port and brings us back into parity again with TG's interface components ui: Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same. ui: VOX panel's second tab now doesn't overlap the other buttons ui: Wiring panel for some machines is now restored to use circular indicators again ui: Smart fridge interface is more in line with sorted inventories as far as layout & tooltips ui: Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date) ui: Reworks RestrictedInput number handling ui: Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, and Checkbox TGUI components (but nothing uses them yet) ui: Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity ui: Updates the ship manipulator window to allow replacing any Shuttle ui: Fixes the supply pod panel not displaying its byondui map correctly ui: Fixes the research terminal duplicating papers in display old mode. ui: Updates the tgui_input_list to for new features like hotkey selection, duplicate key handling, etc fix: Fixes thinking runtimes when quickly switching between tgsay categories code: Shuttle subsystem now is less aggressive with reservations (skipping deletion if below a threshold, delaying reservation if above a threshold) fix: Fixes F5 key still refreshing a TGUI window even if default was set to be prevented (e.g. Hotkey interface) /:cl: --------- Co-authored-by: Jerm <jlsnow301@pm.me>
github-merge-queue bot
pushed a commit
to cmss13-devs/cmss13
that referenced
this pull request
May 19, 2024
# About the pull request This PR is a follow up to #5493 and ultimately is aimed at bringing us back into parity with TG's version of the TGUI components again. For the most part this PR is done via diffing TG's TGUI folder with ours. The PRs listed below are what I found in blames and I double checked to see what files if any they affected outside the TGUI folder. **It is recommended to close VSC and run bin/clean.cmd and then bin/build.cmd if you try out this branch**. You will be using the wrong node & prettier version otherwise. This at least partially ports these PRs (and likely many others - but these I explicitly checked for how they affected other files): - tgstation/tgstation#67935 - tgstation/tgstation#74638 - tgstation/tgstation#75029 - tgstation/tgstation#75431 - tgstation/tgstation#75463 - tgstation/tgstation#75534 - tgstation/tgstation#78879 - tgstation/tgstation#79322 - tgstation/tgstation#79895 - tgstation/tgstation#79898 - tgstation/tgstation#79974 - tgstation/tgstation#79991 - tgstation/tgstation#80044 - tgstation/tgstation#80057 - tgstation/tgstation#80189 - tgstation/tgstation#80304 - tgstation/tgstation#80430 - tgstation/tgstation#80453 - tgstation/tgstation#80454 - tgstation/tgstation#80920 - tgstation/tgstation#81354 - tgstation/tgstation#81381 - tgstation/tgstation#81495 - tgstation/tgstation#82334 - tgstation/tgstation#82377 - tgstation/tgstation#82385 - tgstation/tgstation#82417 - tgstation/tgstation#82420 - tgstation/tgstation#82527 - tgstation/tgstation#82571 - tgstation/tgstation#82792 - tgstation/tgstation#82854 - tgstation/tgstation#83098 - tgstation/tgstation#83096 - tgstation/tgstation#83218 Additionally it ports the new base components from: - tgstation/tgstation#71531 - tgstation/tgstation#71847 - tgstation/tgstation#74544 - tgstation/tgstation#74704 (just a fix to above) - tgstation/tgstation#80743 - tgstation/tgstation#82181 (just a fix to above) - tgstation/tgstation#82533 - tgstation/tgstation#83179 (just a fix to above) But these are missing documentation in the components readme, and we do not have any interface that utilizes them yet. I wanted to explicitly mention them separately so people can see what they can do. Changes I still intend to do in this PR or investigate: - [X] Fix Button.Confirm not properly handling clicks (Sort of stumped on this atm) - [X] Fix Relay Viewer buttons not always updating - [X] Port TGSay 1.1 & TextArea changes (tgstation/tgstation#75431) - [X] Fix ByondUI in Drop pod panel - [X] Check parity with TG again and port anything else that may have been done during the creation of this PR - [X] Find a way to prevent TGSay passthrough when hotkeying InputList (and maybe others)? tgstation/tgstation#75463 Other notable changes not directly related to the above ports, but done as I was fixing other problems: - Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same. - VOX panel's second tab now doesn't overlap the other buttons - Wiring panel from #1623 is now restored to use circular indicators again instead of the regression to ColorBox in #2641 - Smart fridge interface is more in line with sorted inventories as far as layout & tooltips - Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date) - Fixes runtimes when quickly switching between tgsay categories - Basically reverts #5651 in favor of how TG ended up solving it via tgstation/tgstation#81495 - Rolls back SWC to the version TG is currently using because of #6196 (comment) - Adds these commands from tgstation/tgstation#81381 though I also have it check jsx files that somereason TG doesn't do (needs to have been built once to function - just run build.bat):  - Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity. I left out one of the Cyrillic fixes since we shouldn't normally be handling Cyrillic anyways. - Ship manipulator window can now replace any existing shuttle and generally is polished up more than it was. - Ports TGSay 1.1 though I discarded basically all the layout changes they did. - TGUI modals can now accept a ui_state in case you want an alert for say a mob that might qdel while it is open. - Finishes porting the reservation changes to shuttles.dm from tgstation/tgstation#73261 that some reason were absent from #5165 - Fixes F5 refreshing a window if default is prevented (e.g. when the hotkey interface is waiting for a key press). - All depreciated useLocalState is now removed. In almost all situations I could useState, but a few things for MFD on CAS I needed to use sharedState. # Explain why it's good for the game Prepares us for 516 (though still more changes will be necessary) and finalizes the react port. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> New list modal w/ duplicate key handling:  Fixed VOX panel (sound files used to overlap type select):  Updated shuttle manipulator window:    With replace any shuttle support:  Erase current tab chat history:  Working case sensitivity highlights:  Unread counter toggle per tab:  Larger strip panel:  Tacmap panel polish (button positioning + dropdown text color when highlighted):  Minor tweak to camera panel:  Dropdowns will now display above if too little space below:  Kitchen sink works again (F12 w/ tgui-dev):  Layout mode works again (F11 w/ tgui-dev):  New checkbox modal (with theme support):   New handling for button sizes in alert modals (stacked list since options wanted to use more horizontal space than limit):  Polished smart fridge + restore wiring panel:  Fixed byondui in supply pod menu:  TG Say:  Some unchanged panels (to just show working):                         </details> # Changelog :cl: Drathek, mullenpaul ui: Finalizes the TGUI React port and brings us back into parity again with TG's interface components ui: Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same. ui: VOX panel's second tab now doesn't overlap the other buttons ui: Wiring panel for some machines is now restored to use circular indicators again ui: Smart fridge interface is more in line with sorted inventories as far as layout & tooltips ui: Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date) ui: Reworks RestrictedInput number handling ui: Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, and Checkbox TGUI components (but nothing uses them yet) ui: Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity ui: Updates the ship manipulator window to allow replacing any Shuttle ui: Fixes the supply pod panel not displaying its byondui map correctly ui: Fixes the research terminal duplicating papers in display old mode. ui: Updates the tgui_input_list to for new features like hotkey selection, duplicate key handling, etc fix: Fixes thinking runtimes when quickly switching between tgsay categories code: Shuttle subsystem now is less aggressive with reservations (skipping deletion if below a threshold, delaying reservation if above a threshold) fix: Fixes F5 key still refreshing a TGUI window even if default was set to be prevented (e.g. Hotkey interface) /:cl: --------- Co-authored-by: Jerm <jlsnow301@pm.me>
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.
About The Pull Request
Context: #82522
Apparently you cant just stuff the byond helper functions into an external js file, but if you do, byond won't even let you know its a problem until the servers crash and you have to run
bin/cleanjust to unbork your entire repoThis reimplements the changes from #82473 without:
Why It's Good For The Game
516 prep (again this time)