From cede532f69f48c023c4ec4c20026989ea25b89a9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 9 Feb 2021 16:06:40 +0100 Subject: [PATCH] [MIRROR] Nuke Window resizable and improve drag code (#3239) * Nuke Window resizable and improve drag code (#56727) * Nuke Window resizable and improve drag code Co-authored-by: Aleksej Komarov --- tgui/docs/component-reference.md | 7 ++- tgui/packages/tgui/debug/KitchenSink.js | 3 +- tgui/packages/tgui/drag.js | 21 +++++---- .../tgui/interfaces/AbductorConsole.js | 3 +- tgui/packages/tgui/interfaces/Achievements.js | 3 +- tgui/packages/tgui/interfaces/AiRestorer.js | 3 +- tgui/packages/tgui/interfaces/AirAlarm.js | 3 +- tgui/packages/tgui/interfaces/AlertModal.js | 3 +- tgui/packages/tgui/interfaces/Apc.js | 3 +- tgui/packages/tgui/interfaces/ApcControl.js | 3 +- tgui/packages/tgui/interfaces/Aquarium.js | 3 +- .../tgui/interfaces/AtmosAlertConsole.js | 3 +- .../tgui/interfaces/AtmosControlConsole.js | 3 +- .../tgui/interfaces/AtmosControlPanel.js | 3 +- tgui/packages/tgui/interfaces/Biogenerator.js | 3 +- .../tgui/interfaces/BlackMarketUplink.js | 3 +- .../tgui/interfaces/BluespaceLocator.js | 3 +- tgui/packages/tgui/interfaces/BorgPanel.js | 3 +- tgui/packages/tgui/interfaces/BrigTimer.js | 3 +- .../packages/tgui/interfaces/CameraConsole.js | 3 +- tgui/packages/tgui/interfaces/Canvas.js | 3 +- tgui/packages/tgui/interfaces/Cargo.js | 3 +- tgui/packages/tgui/interfaces/CargoExpress.js | 3 +- .../tgui/interfaces/CargoHoldTerminal.js | 3 +- .../tgui/interfaces/CellularEmporium.js | 3 +- .../tgui/interfaces/CentcomPodLauncher.js | 9 +--- .../tgui/interfaces/ChemDebugSynthesizer.js | 3 +- .../packages/tgui/interfaces/ChemDispenser.js | 3 +- tgui/packages/tgui/interfaces/ChemFilter.js | 3 +- tgui/packages/tgui/interfaces/ChemHeater.js | 3 +- tgui/packages/tgui/interfaces/ChemMaster.js | 3 +- .../tgui/interfaces/ChemReactionChamber.js | 3 +- .../tgui/interfaces/CivCargoHoldTerminal.js | 2 +- .../tgui/interfaces/CommunicationsConsole.js | 3 +- .../tgui/interfaces/ComputerFabricator.js | 3 +- tgui/packages/tgui/interfaces/Crayon.js | 3 +- tgui/packages/tgui/interfaces/CrewConsole.js | 3 +- tgui/packages/tgui/interfaces/Cryo.js | 3 +- tgui/packages/tgui/interfaces/DnaConsole.js | 3 +- .../tgui/interfaces/EngravedMessage.js | 3 +- .../tgui/interfaces/ExosuitControlConsole.js | 3 +- .../tgui/interfaces/ExosuitFabricator.js | 3 +- tgui/packages/tgui/interfaces/Filteriffic.js | 5 +- tgui/packages/tgui/interfaces/FishCatalog.js | 3 +- .../packages/tgui/interfaces/ForbiddenLore.js | 3 +- tgui/packages/tgui/interfaces/Gateway.js | 2 +- tgui/packages/tgui/interfaces/Gps.js | 3 +- .../tgui/interfaces/GulagItemReclaimer.js | 3 +- tgui/packages/tgui/interfaces/Holodeck.js | 3 +- tgui/packages/tgui/interfaces/Holopad.js | 3 +- tgui/packages/tgui/interfaces/Hypertorus.js | 36 +++++++------- tgui/packages/tgui/interfaces/Intellicard.js | 3 +- tgui/packages/tgui/interfaces/LanguageMenu.js | 3 +- .../tgui/interfaces/LaunchpadConsole.js | 3 +- tgui/packages/tgui/interfaces/ListInput.js | 3 +- tgui/packages/tgui/interfaces/MafiaPanel.js | 3 +- .../interfaces/MalfunctionModulePicker.js | 3 +- .../tgui/interfaces/MechpadConsole.js | 3 +- tgui/packages/tgui/interfaces/MedicalKiosk.js | 3 +- tgui/packages/tgui/interfaces/Microscope.js | 2 +- tgui/packages/tgui/interfaces/MiningVendor.js | 3 +- .../tgui/interfaces/NaniteChamberControl.js | 3 +- .../tgui/interfaces/NaniteCloudControl.js | 3 +- .../tgui/interfaces/NaniteProgramHub.js | 3 +- .../tgui/interfaces/NaniteProgrammer.js | 3 +- tgui/packages/tgui/interfaces/NaniteRemote.js | 3 +- .../interfaces/NotificationPreferences.js | 3 +- .../tgui/interfaces/NtosAiRestorer.js | 3 +- tgui/packages/tgui/interfaces/NtosAtmos.js | 3 +- tgui/packages/tgui/interfaces/NtosCard.js | 3 +- tgui/packages/tgui/interfaces/NtosCargo.js | 3 +- .../tgui/interfaces/NtosConfiguration.js | 3 +- .../tgui/interfaces/NtosCrewManifest.js | 3 +- .../interfaces/NtosCyborgRemoteMonitor.js | 3 +- .../tgui/interfaces/NtosFileManager.js | 2 +- .../tgui/interfaces/NtosJobManager.js | 3 +- tgui/packages/tgui/interfaces/NtosMain.js | 3 +- .../tgui/interfaces/NtosNetDownloader.js | 3 +- .../tgui/interfaces/NtosNetMonitor.js | 2 +- .../tgui/interfaces/NtosPowerMonitor.js | 3 +- .../tgui/interfaces/NtosRequestKiosk.js | 3 +- .../tgui/interfaces/NtosRoboControl.js | 3 +- tgui/packages/tgui/interfaces/NtosShipping.js | 3 +- .../interfaces/NtosStationAlertConsole.js | 3 +- .../tgui/interfaces/NtosSupermatterMonitor.js | 3 +- .../tgui/interfaces/OperatingComputer.js | 3 +- tgui/packages/tgui/interfaces/OreBox.js | 3 +- .../tgui/interfaces/OreRedemptionMachine.js | 3 +- tgui/packages/tgui/interfaces/Pandemic.js | 3 +- tgui/packages/tgui/interfaces/PaperSheet.js | 3 +- .../tgui/interfaces/PersonalCrafting.js | 3 +- .../tgui/interfaces/PortableChemMixer.js | 3 +- .../tgui/interfaces/PortableGenerator.js | 3 +- .../tgui/interfaces/PortableScrubber.js | 2 +- tgui/packages/tgui/interfaces/PowerMonitor.js | 3 +- .../tgui/interfaces/RapidPipeDispenser.js | 3 +- .../tgui/interfaces/RemoteRobotControl.js | 3 +- tgui/packages/tgui/interfaces/RequestKiosk.js | 3 +- .../tgui/interfaces/RoboticsControlConsole.js | 3 +- tgui/packages/tgui/interfaces/ScannerGate.js | 3 +- .../packages/tgui/interfaces/SeedExtractor.js | 3 +- .../tgui/interfaces/ShuttleManipulator.js | 3 +- tgui/packages/tgui/interfaces/SkillPanel.js | 3 +- tgui/packages/tgui/interfaces/SkillStation.js | 3 +- tgui/packages/tgui/interfaces/SmartVend.js | 3 +- tgui/packages/tgui/interfaces/SpawnersMenu.js | 3 +- tgui/packages/tgui/interfaces/Stack.js | 3 +- .../tgui/interfaces/StackingConsole.js | 3 +- .../tgui/interfaces/StationAlertConsole.js | 3 +- .../tgui/interfaces/SyndContractor.js | 3 +- tgui/packages/tgui/interfaces/TachyonArray.js | 3 +- tgui/packages/tgui/interfaces/Tank.js | 1 - tgui/packages/tgui/interfaces/Telecomms.js | 47 +++++++++---------- .../tgui/interfaces/TrackedPlaytime.js | 19 ++------ tgui/packages/tgui/interfaces/Uplink.js | 3 +- tgui/packages/tgui/interfaces/Vending.js | 3 +- tgui/packages/tgui/layouts/NtosWindow.js | 4 +- tgui/packages/tgui/layouts/Window.js | 20 ++++++-- tgui/packages/tgui/routes.js | 4 +- tgui/packages/tgui/stories/Storage.stories.js | 2 + 120 files changed, 193 insertions(+), 300 deletions(-) diff --git a/tgui/docs/component-reference.md b/tgui/docs/component-reference.md index 29be4ef527c..39b2755316d 100644 --- a/tgui/docs/component-reference.md +++ b/tgui/docs/component-reference.md @@ -1117,9 +1117,7 @@ it in one way or another. Example: ```jsx - + Hello, world! @@ -1133,7 +1131,8 @@ Example: - `theme: string` - A name of the theme. - For a list of themes, see `packages/tgui/styles/themes`. - `title: string` - Window title. -- `resizable: boolean` - Controls resizability of the window. +- `width: number` - Window width. +- `height: number` - Window height. - `noClose: boolean` - Controls the ability to close the window. - `children: any` - Child elements, which are rendered directly inside the window. If you use a [Dimmer](#dimmer) or [Modal](#modal) in your UI, diff --git a/tgui/packages/tgui/debug/KitchenSink.js b/tgui/packages/tgui/debug/KitchenSink.js index e675fe04bd3..44764e8e894 100644 --- a/tgui/packages/tgui/debug/KitchenSink.js +++ b/tgui/packages/tgui/debug/KitchenSink.js @@ -32,8 +32,7 @@ export const KitchenSink = (props, context) => { title="Kitchen Sink" width={600} height={500} - theme={theme} - resizable> + theme={theme}>
diff --git a/tgui/packages/tgui/drag.js b/tgui/packages/tgui/drag.js index 41985567b37..d6f0967a8dd 100644 --- a/tgui/packages/tgui/drag.js +++ b/tgui/packages/tgui/drag.js @@ -107,14 +107,24 @@ export const recallWindowGeometry = async (options = {}) => { logger.log('recalled geometry:', geometry); } let pos = geometry?.pos || options.pos; - const size = options.size; + let size = options.size; + // Wait until screen offset gets resolved + await screenOffsetPromise; + const areaAvailable = [ + window.screen.availWidth, + window.screen.availHeight, + ]; // Set window size if (size) { + // Constraint size to not exceed available screen area. + size = [ + Math.min(areaAvailable[0], size[0]), + Math.min(areaAvailable[1], size[1]), + ]; setWindowSize(size); } // Set window position if (pos) { - await screenOffsetPromise; // Constraint window position if monitor lock was set in preferences. if (size && options.locked) { pos = constraintPosition(pos, size)[1]; @@ -123,12 +133,7 @@ export const recallWindowGeometry = async (options = {}) => { } // Set window position at the center of the screen. else if (size) { - await screenOffsetPromise; - const areaAvailable = [ - window.screen.availWidth - Math.abs(screenOffset[0]), - window.screen.availHeight - Math.abs(screenOffset[1]), - ]; - const pos = vecAdd( + pos = vecAdd( vecScale(areaAvailable, 0.5), vecScale(size, -0.5), vecScale(screenOffset, -1.0)); diff --git a/tgui/packages/tgui/interfaces/AbductorConsole.js b/tgui/packages/tgui/interfaces/AbductorConsole.js index b67025a3e10..57cda1091af 100644 --- a/tgui/packages/tgui/interfaces/AbductorConsole.js +++ b/tgui/packages/tgui/interfaces/AbductorConsole.js @@ -9,8 +9,7 @@ export const AbductorConsole = (props, context) => { + height={532}> { + height={680}> {categories.map(category => ( diff --git a/tgui/packages/tgui/interfaces/AiRestorer.js b/tgui/packages/tgui/interfaces/AiRestorer.js index 9ca8b43f8d8..57228a25717 100644 --- a/tgui/packages/tgui/interfaces/AiRestorer.js +++ b/tgui/packages/tgui/interfaces/AiRestorer.js @@ -6,8 +6,7 @@ export const AiRestorer = () => { return ( + height={360}> diff --git a/tgui/packages/tgui/interfaces/AirAlarm.js b/tgui/packages/tgui/interfaces/AirAlarm.js index 0300ae14974..ed493236531 100644 --- a/tgui/packages/tgui/interfaces/AirAlarm.js +++ b/tgui/packages/tgui/interfaces/AirAlarm.js @@ -12,8 +12,7 @@ export const AirAlarm = (props, context) => { return ( + height={650}> diff --git a/tgui/packages/tgui/interfaces/AlertModal.js b/tgui/packages/tgui/interfaces/AlertModal.js index f33a260c0f9..944c72074a1 100644 --- a/tgui/packages/tgui/interfaces/AlertModal.js +++ b/tgui/packages/tgui/interfaces/AlertModal.js @@ -22,8 +22,7 @@ export const AlertModal = (props, context) => { + height={150}> {timeout !== undefined && } diff --git a/tgui/packages/tgui/interfaces/Apc.js b/tgui/packages/tgui/interfaces/Apc.js index fe8830e69f2..46eeac69c51 100644 --- a/tgui/packages/tgui/interfaces/Apc.js +++ b/tgui/packages/tgui/interfaces/Apc.js @@ -7,8 +7,7 @@ export const Apc = (props, context) => { return ( + height={445}> diff --git a/tgui/packages/tgui/interfaces/ApcControl.js b/tgui/packages/tgui/interfaces/ApcControl.js index 620da6f1dec..fd5ab9aff34 100644 --- a/tgui/packages/tgui/interfaces/ApcControl.js +++ b/tgui/packages/tgui/interfaces/ApcControl.js @@ -12,8 +12,7 @@ export const ApcControl = (props, context) => { + height={500}> {data.authenticated === 1 && ( )} diff --git a/tgui/packages/tgui/interfaces/Aquarium.js b/tgui/packages/tgui/interfaces/Aquarium.js index 9b1680a145f..a9049b554b1 100644 --- a/tgui/packages/tgui/interfaces/Aquarium.js +++ b/tgui/packages/tgui/interfaces/Aquarium.js @@ -16,8 +16,7 @@ export const Aquarium = (props, context) => { return ( + height={400}>
diff --git a/tgui/packages/tgui/interfaces/AtmosAlertConsole.js b/tgui/packages/tgui/interfaces/AtmosAlertConsole.js index 1d55ccf5957..87703884b53 100644 --- a/tgui/packages/tgui/interfaces/AtmosAlertConsole.js +++ b/tgui/packages/tgui/interfaces/AtmosAlertConsole.js @@ -9,8 +9,7 @@ export const AtmosAlertConsole = (props, context) => { return ( + height={300}>
    diff --git a/tgui/packages/tgui/interfaces/AtmosControlConsole.js b/tgui/packages/tgui/interfaces/AtmosControlConsole.js index fa35fbc7f3c..932f147ef35 100644 --- a/tgui/packages/tgui/interfaces/AtmosControlConsole.js +++ b/tgui/packages/tgui/interfaces/AtmosControlConsole.js @@ -10,8 +10,7 @@ export const AtmosControlConsole = (props, context) => { return ( + height={315}>
    diff --git a/tgui/packages/tgui/interfaces/AtmosControlPanel.js b/tgui/packages/tgui/interfaces/AtmosControlPanel.js index bf9d4c033ac..3e2141c0fcf 100644 --- a/tgui/packages/tgui/interfaces/AtmosControlPanel.js +++ b/tgui/packages/tgui/interfaces/AtmosControlPanel.js @@ -18,8 +18,7 @@ export const AtmosControlPanel = (props, context) => { + height={500}>
    { return ( + height={420}> {!!processing && ( diff --git a/tgui/packages/tgui/interfaces/BlackMarketUplink.js b/tgui/packages/tgui/interfaces/BlackMarketUplink.js index 5199a56bac2..534882d9b28 100644 --- a/tgui/packages/tgui/interfaces/BlackMarketUplink.js +++ b/tgui/packages/tgui/interfaces/BlackMarketUplink.js @@ -17,8 +17,7 @@ export const BlackMarketUplink = (props, context) => { + theme="hackerman">
    { return ( + height={300}> { + height={700}>
    { return ( + height={138}>
    { return ( + height={708}>
    diff --git a/tgui/packages/tgui/interfaces/Canvas.js b/tgui/packages/tgui/interfaces/Canvas.js index 403c2d77505..4a73fc60558 100644 --- a/tgui/packages/tgui/interfaces/Canvas.js +++ b/tgui/packages/tgui/interfaces/Canvas.js @@ -90,8 +90,7 @@ export const Canvas = (props, context) => { return ( + height={Math.min(700, height * dotsize + 72)}> { return ( + height={750}> diff --git a/tgui/packages/tgui/interfaces/CargoExpress.js b/tgui/packages/tgui/interfaces/CargoExpress.js index e859cf15c59..9cbd9aef5da 100644 --- a/tgui/packages/tgui/interfaces/CargoExpress.js +++ b/tgui/packages/tgui/interfaces/CargoExpress.js @@ -9,8 +9,7 @@ export const CargoExpress = (props, context) => { return ( + height={700}> diff --git a/tgui/packages/tgui/interfaces/CargoHoldTerminal.js b/tgui/packages/tgui/interfaces/CargoHoldTerminal.js index afa47c745c7..82db3c9dd84 100644 --- a/tgui/packages/tgui/interfaces/CargoHoldTerminal.js +++ b/tgui/packages/tgui/interfaces/CargoHoldTerminal.js @@ -13,8 +13,7 @@ export const CargoHoldTerminal = (props, context) => { return ( + height={230}>
    diff --git a/tgui/packages/tgui/interfaces/CellularEmporium.js b/tgui/packages/tgui/interfaces/CellularEmporium.js index 8eb16470d20..339d09220f4 100644 --- a/tgui/packages/tgui/interfaces/CellularEmporium.js +++ b/tgui/packages/tgui/interfaces/CellularEmporium.js @@ -8,8 +8,7 @@ export const CellularEmporium = (props, context) => { return ( + height={480}>
    diff --git a/tgui/packages/tgui/interfaces/CentcomPodLauncher.js b/tgui/packages/tgui/interfaces/CentcomPodLauncher.js index 35ecc4decb9..c882ce936be 100644 --- a/tgui/packages/tgui/interfaces/CentcomPodLauncher.js +++ b/tgui/packages/tgui/interfaces/CentcomPodLauncher.js @@ -22,13 +22,8 @@ export const CentcomPodLauncher = (props, context) => { const [compact] = useCompact(context); return ( diff --git a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js b/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js index c7467bec424..23786c9f4e3 100644 --- a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js +++ b/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js @@ -14,8 +14,7 @@ export const ChemDebugSynthesizer = (props, context) => { return ( + height={330}>
    { return ( + height={620}>
    { return ( + height={300}> diff --git a/tgui/packages/tgui/interfaces/ChemHeater.js b/tgui/packages/tgui/interfaces/ChemHeater.js index 1e1a9057c4e..40e09164ae8 100644 --- a/tgui/packages/tgui/interfaces/ChemHeater.js +++ b/tgui/packages/tgui/interfaces/ChemHeater.js @@ -18,8 +18,7 @@ export const ChemHeater = (props, context) => { return ( + height={320}>
    { return ( + height={550}> {screen === 'analyze' && ( diff --git a/tgui/packages/tgui/interfaces/ChemReactionChamber.js b/tgui/packages/tgui/interfaces/ChemReactionChamber.js index cbcf5574d84..df9e0567be9 100644 --- a/tgui/packages/tgui/interfaces/ChemReactionChamber.js +++ b/tgui/packages/tgui/interfaces/ChemReactionChamber.js @@ -19,8 +19,7 @@ export const ChemReactionChamber = (props, context) => { return ( + height={225}>
    { const in_text = "Welcome valued employee."; const out_text = "To begin, insert your ID into the console."; return ( - diff --git a/tgui/packages/tgui/interfaces/CommunicationsConsole.js b/tgui/packages/tgui/interfaces/CommunicationsConsole.js index 9411257b176..bad438e4b73 100644 --- a/tgui/packages/tgui/interfaces/CommunicationsConsole.js +++ b/tgui/packages/tgui/interfaces/CommunicationsConsole.js @@ -709,8 +709,7 @@ export const CommunicationsConsole = (props, context) => { + theme={emagged ? "syndicate" : undefined}> {!hasConnection && } diff --git a/tgui/packages/tgui/interfaces/ComputerFabricator.js b/tgui/packages/tgui/interfaces/ComputerFabricator.js index 9a67627b32c..70435c7deb3 100644 --- a/tgui/packages/tgui/interfaces/ComputerFabricator.js +++ b/tgui/packages/tgui/interfaces/ComputerFabricator.js @@ -9,8 +9,7 @@ export const ComputerFabricator = (props, context) => { + height={400}>
    Your perfect device, only three steps away... diff --git a/tgui/packages/tgui/interfaces/Crayon.js b/tgui/packages/tgui/interfaces/Crayon.js index 05191f8c66b..365b5c6183a 100644 --- a/tgui/packages/tgui/interfaces/Crayon.js +++ b/tgui/packages/tgui/interfaces/Crayon.js @@ -9,8 +9,7 @@ export const Crayon = (props, context) => { return ( + height={600}> {!!capOrChanges && (
    diff --git a/tgui/packages/tgui/interfaces/CrewConsole.js b/tgui/packages/tgui/interfaces/CrewConsole.js index 8cfdfe49e69..872c4c9ce22 100644 --- a/tgui/packages/tgui/interfaces/CrewConsole.js +++ b/tgui/packages/tgui/interfaces/CrewConsole.js @@ -64,8 +64,7 @@ export const CrewConsole = () => { + height={600}>
    diff --git a/tgui/packages/tgui/interfaces/Cryo.js b/tgui/packages/tgui/interfaces/Cryo.js index aa8acad3189..286cf1589c5 100644 --- a/tgui/packages/tgui/interfaces/Cryo.js +++ b/tgui/packages/tgui/interfaces/Cryo.js @@ -26,8 +26,7 @@ export const Cryo = () => { return ( + height={550}> diff --git a/tgui/packages/tgui/interfaces/DnaConsole.js b/tgui/packages/tgui/interfaces/DnaConsole.js index 07c438d5ada..403ca85eb89 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole.js +++ b/tgui/packages/tgui/interfaces/DnaConsole.js @@ -78,8 +78,7 @@ export const DnaConsole = (props, context) => { + height={710}> {!!isPulsingRads && ( { return ( + height={300}>
    { return ( + height={500}> {mechs.length === 0 && ( diff --git a/tgui/packages/tgui/interfaces/ExosuitFabricator.js b/tgui/packages/tgui/interfaces/ExosuitFabricator.js index 1d3e901607e..f149f9d4027 100644 --- a/tgui/packages/tgui/interfaces/ExosuitFabricator.js +++ b/tgui/packages/tgui/interfaces/ExosuitFabricator.js @@ -137,8 +137,7 @@ export const ExosuitFabricator = (props, context) => { + height={640}> diff --git a/tgui/packages/tgui/interfaces/Filteriffic.js b/tgui/packages/tgui/interfaces/Filteriffic.js index 31483461a54..cdebeaa9583 100644 --- a/tgui/packages/tgui/interfaces/Filteriffic.js +++ b/tgui/packages/tgui/interfaces/Filteriffic.js @@ -247,10 +247,9 @@ export const Filteriffic = (props, context) => { const [hiddenSecret, setHiddenSecret] = useLocalState(context, 'hidden', false); return ( + width={500} + height={500}> DO NOT MESS WITH EXISTING FILTERS IF YOU DO NOT KNOW THE CONSEQUENCES. diff --git a/tgui/packages/tgui/interfaces/FishCatalog.js b/tgui/packages/tgui/interfaces/FishCatalog.js index 51226bf3bc3..33e6544a5c4 100644 --- a/tgui/packages/tgui/interfaces/FishCatalog.js +++ b/tgui/packages/tgui/interfaces/FishCatalog.js @@ -22,8 +22,7 @@ export const FishCatalog = (props, context) => { return ( + height={300}> diff --git a/tgui/packages/tgui/interfaces/ForbiddenLore.js b/tgui/packages/tgui/interfaces/ForbiddenLore.js index 1225132810a..492fceaaa76 100644 --- a/tgui/packages/tgui/interfaces/ForbiddenLore.js +++ b/tgui/packages/tgui/interfaces/ForbiddenLore.js @@ -16,8 +16,7 @@ export const ForbiddenLore = (props, context) => { return ( + height={900}>
    Charges left : {charges} diff --git a/tgui/packages/tgui/interfaces/Gateway.js b/tgui/packages/tgui/interfaces/Gateway.js index 2bf59d24b0d..402187a0f83 100644 --- a/tgui/packages/tgui/interfaces/Gateway.js +++ b/tgui/packages/tgui/interfaces/Gateway.js @@ -4,7 +4,7 @@ import { Window } from '../layouts'; export const Gateway = () => { return ( - + diff --git a/tgui/packages/tgui/interfaces/Gps.js b/tgui/packages/tgui/interfaces/Gps.js index 09549c3375a..9980aca19c1 100644 --- a/tgui/packages/tgui/interfaces/Gps.js +++ b/tgui/packages/tgui/interfaces/Gps.js @@ -39,8 +39,7 @@ export const Gps = (props, context) => { + height={700}>
    { return ( + height={400}> {mobs.length === 0 && ( diff --git a/tgui/packages/tgui/interfaces/Holodeck.js b/tgui/packages/tgui/interfaces/Holodeck.js index a81aef1497a..3f2c0bd4173 100644 --- a/tgui/packages/tgui/interfaces/Holodeck.js +++ b/tgui/packages/tgui/interfaces/Holodeck.js @@ -14,8 +14,7 @@ export const Holodeck = (props, context) => { return ( + height={500}>
    { return ( + height={245}> {!!calling && ( { const { act, data } = useBackend(context); @@ -47,15 +47,13 @@ export const Hypertorus = (props, context) => { const moderatorMax = Math.max(1, ...moderator_gases.map(gas => gas.amount)); return ( - + height={600}> +
    - - + + {'Start power: '}
    diff --git a/tgui/packages/tgui/interfaces/Intellicard.js b/tgui/packages/tgui/interfaces/Intellicard.js index 1a6e3885d9f..e672987ed9b 100644 --- a/tgui/packages/tgui/interfaces/Intellicard.js +++ b/tgui/packages/tgui/interfaces/Intellicard.js @@ -18,8 +18,7 @@ export const Intellicard = (props, context) => { return ( + height={500}>
    { + height={600}>
    diff --git a/tgui/packages/tgui/interfaces/LaunchpadConsole.js b/tgui/packages/tgui/interfaces/LaunchpadConsole.js index 83f8d0aa59e..0b64ac4b2c0 100644 --- a/tgui/packages/tgui/interfaces/LaunchpadConsole.js +++ b/tgui/packages/tgui/interfaces/LaunchpadConsole.js @@ -199,8 +199,7 @@ export const LaunchpadConsole = (props, context) => { return ( + height={260}> {launchpads.length === 0 && ( diff --git a/tgui/packages/tgui/interfaces/ListInput.js b/tgui/packages/tgui/interfaces/ListInput.js index 855ffe005db..f06688f0264 100644 --- a/tgui/packages/tgui/interfaces/ListInput.js +++ b/tgui/packages/tgui/interfaces/ListInput.js @@ -104,8 +104,7 @@ export const ListInput = (props, context) => { + height={325}> {timeout !== undefined && } diff --git a/tgui/packages/tgui/interfaces/MafiaPanel.js b/tgui/packages/tgui/interfaces/MafiaPanel.js index 95ed7b0557b..ea78b905b5d 100644 --- a/tgui/packages/tgui/interfaces/MafiaPanel.js +++ b/tgui/packages/tgui/interfaces/MafiaPanel.js @@ -18,8 +18,7 @@ export const MafiaPanel = (props, context) => { title="Mafia" theme={role_theme} width={650} - height={580} - resizable> + height={580}> {!roleinfo && ( diff --git a/tgui/packages/tgui/interfaces/MalfunctionModulePicker.js b/tgui/packages/tgui/interfaces/MalfunctionModulePicker.js index 70a1716ed68..05bd80cdd9b 100644 --- a/tgui/packages/tgui/interfaces/MalfunctionModulePicker.js +++ b/tgui/packages/tgui/interfaces/MalfunctionModulePicker.js @@ -11,8 +11,7 @@ export const MalfunctionModulePicker = (props, context) => { + theme="malfunction"> { return ( + height={130}> {mechpads.length === 0 && ( diff --git a/tgui/packages/tgui/interfaces/MedicalKiosk.js b/tgui/packages/tgui/interfaces/MedicalKiosk.js index 8f904accfbc..588d11e738d 100644 --- a/tgui/packages/tgui/interfaces/MedicalKiosk.js +++ b/tgui/packages/tgui/interfaces/MedicalKiosk.js @@ -15,8 +15,7 @@ export const MedicalKiosk = (props, context) => { return ( + height={420}> diff --git a/tgui/packages/tgui/interfaces/Microscope.js b/tgui/packages/tgui/interfaces/Microscope.js index a1793ed7b04..81a1fc9f208 100644 --- a/tgui/packages/tgui/interfaces/Microscope.js +++ b/tgui/packages/tgui/interfaces/Microscope.js @@ -11,7 +11,7 @@ export const Microscope = (props, context) => { viruses = [], } = data; return ( - +
    diff --git a/tgui/packages/tgui/interfaces/MiningVendor.js b/tgui/packages/tgui/interfaces/MiningVendor.js index 39ff2969b1f..4afa503fc4b 100644 --- a/tgui/packages/tgui/interfaces/MiningVendor.js +++ b/tgui/packages/tgui/interfaces/MiningVendor.js @@ -11,8 +11,7 @@ export const MiningVendor = (props, context) => { return ( + height={600}>
    {data.user && ( diff --git a/tgui/packages/tgui/interfaces/NaniteChamberControl.js b/tgui/packages/tgui/interfaces/NaniteChamberControl.js index f9109a91c5f..28e62f15d5d 100644 --- a/tgui/packages/tgui/interfaces/NaniteChamberControl.js +++ b/tgui/packages/tgui/interfaces/NaniteChamberControl.js @@ -6,8 +6,7 @@ export const NaniteChamberControl = (props, context) => { return ( + height={570}> diff --git a/tgui/packages/tgui/interfaces/NaniteCloudControl.js b/tgui/packages/tgui/interfaces/NaniteCloudControl.js index 8c8ac7efd2c..e679c36e40c 100644 --- a/tgui/packages/tgui/interfaces/NaniteCloudControl.js +++ b/tgui/packages/tgui/interfaces/NaniteCloudControl.js @@ -280,8 +280,7 @@ export const NaniteCloudControl = (props, context) => { return ( + height={700}>
    { return ( + height={700}>
    { return ( + height={550}> diff --git a/tgui/packages/tgui/interfaces/NaniteRemote.js b/tgui/packages/tgui/interfaces/NaniteRemote.js index e0eaaf39fc5..0fab8def544 100644 --- a/tgui/packages/tgui/interfaces/NaniteRemote.js +++ b/tgui/packages/tgui/interfaces/NaniteRemote.js @@ -6,8 +6,7 @@ export const NaniteRemote = (props, context) => { return ( + height={500}> diff --git a/tgui/packages/tgui/interfaces/NotificationPreferences.js b/tgui/packages/tgui/interfaces/NotificationPreferences.js index 3d8e4d15daa..74969c06bc3 100644 --- a/tgui/packages/tgui/interfaces/NotificationPreferences.js +++ b/tgui/packages/tgui/interfaces/NotificationPreferences.js @@ -20,8 +20,7 @@ export const NotificationPreferences = (props, context) => { + height={360}>
    {ignores.map(ignore => ( diff --git a/tgui/packages/tgui/interfaces/NtosAiRestorer.js b/tgui/packages/tgui/interfaces/NtosAiRestorer.js index b305a16158f..a5ebf22d52a 100644 --- a/tgui/packages/tgui/interfaces/NtosAiRestorer.js +++ b/tgui/packages/tgui/interfaces/NtosAiRestorer.js @@ -5,8 +5,7 @@ export const NtosAiRestorer = () => { return ( + height={400}> diff --git a/tgui/packages/tgui/interfaces/NtosAtmos.js b/tgui/packages/tgui/interfaces/NtosAtmos.js index 0e8141b9ea8..b5c3136dd16 100644 --- a/tgui/packages/tgui/interfaces/NtosAtmos.js +++ b/tgui/packages/tgui/interfaces/NtosAtmos.js @@ -20,8 +20,7 @@ export const NtosAtmos = (props, context) => { return ( + height={350}>
    diff --git a/tgui/packages/tgui/interfaces/NtosCard.js b/tgui/packages/tgui/interfaces/NtosCard.js index 1f254d1e885..acb2c62793d 100644 --- a/tgui/packages/tgui/interfaces/NtosCard.js +++ b/tgui/packages/tgui/interfaces/NtosCard.js @@ -7,8 +7,7 @@ export const NtosCard = (props, context) => { return ( + height={520}> diff --git a/tgui/packages/tgui/interfaces/NtosCargo.js b/tgui/packages/tgui/interfaces/NtosCargo.js index 26a1b16afec..4570614fa86 100644 --- a/tgui/packages/tgui/interfaces/NtosCargo.js +++ b/tgui/packages/tgui/interfaces/NtosCargo.js @@ -5,8 +5,7 @@ export const NtosCargo = (props, context) => { return ( + height={500}> diff --git a/tgui/packages/tgui/interfaces/NtosConfiguration.js b/tgui/packages/tgui/interfaces/NtosConfiguration.js index 5457c08180b..590005adade 100644 --- a/tgui/packages/tgui/interfaces/NtosConfiguration.js +++ b/tgui/packages/tgui/interfaces/NtosConfiguration.js @@ -17,8 +17,7 @@ export const NtosConfiguration = (props, context) => { + height={630}>
    { return ( + height={480}>
    { return ( + height={800}> diff --git a/tgui/packages/tgui/interfaces/NtosFileManager.js b/tgui/packages/tgui/interfaces/NtosFileManager.js index e8a85f5602d..ac2e33ee874 100644 --- a/tgui/packages/tgui/interfaces/NtosFileManager.js +++ b/tgui/packages/tgui/interfaces/NtosFileManager.js @@ -11,7 +11,7 @@ export const NtosFileManager = (props, context) => { usbfiles = [], } = data; return ( - +
    { return ( + height={620}> diff --git a/tgui/packages/tgui/interfaces/NtosMain.js b/tgui/packages/tgui/interfaces/NtosMain.js index f73b5d129ba..95e2676cd00 100644 --- a/tgui/packages/tgui/interfaces/NtosMain.js +++ b/tgui/packages/tgui/interfaces/NtosMain.js @@ -21,8 +21,7 @@ export const NtosMain = (props, context) => { || 'NtOS Main Menu'} theme={device_theme} width={400} - height={500} - resizable> + height={500}> {!!has_light && (
    diff --git a/tgui/packages/tgui/interfaces/NtosNetDownloader.js b/tgui/packages/tgui/interfaces/NtosNetDownloader.js index 0bc480d2cfd..ae9e6b94c75 100644 --- a/tgui/packages/tgui/interfaces/NtosNetDownloader.js +++ b/tgui/packages/tgui/interfaces/NtosNetDownloader.js @@ -17,8 +17,7 @@ export const NtosNetDownloader = (props, context) => { + height={735}> {!!error && ( diff --git a/tgui/packages/tgui/interfaces/NtosNetMonitor.js b/tgui/packages/tgui/interfaces/NtosNetMonitor.js index 95038fb1f32..f0aaad2231a 100644 --- a/tgui/packages/tgui/interfaces/NtosNetMonitor.js +++ b/tgui/packages/tgui/interfaces/NtosNetMonitor.js @@ -19,7 +19,7 @@ export const NtosNetMonitor = (props, context) => { ntnetlogs = [], } = data; return ( - + WARNING: Disabling wireless transmitters when using diff --git a/tgui/packages/tgui/interfaces/NtosPowerMonitor.js b/tgui/packages/tgui/interfaces/NtosPowerMonitor.js index c178fa76631..04d80fc1c7e 100644 --- a/tgui/packages/tgui/interfaces/NtosPowerMonitor.js +++ b/tgui/packages/tgui/interfaces/NtosPowerMonitor.js @@ -5,8 +5,7 @@ export const NtosPowerMonitor = () => { return ( + height={700}> diff --git a/tgui/packages/tgui/interfaces/NtosRequestKiosk.js b/tgui/packages/tgui/interfaces/NtosRequestKiosk.js index 63a8dc63f66..efb4b647732 100644 --- a/tgui/packages/tgui/interfaces/NtosRequestKiosk.js +++ b/tgui/packages/tgui/interfaces/NtosRequestKiosk.js @@ -5,8 +5,7 @@ export const NtosRequestKiosk = (props, context) => { return ( + height={600}> diff --git a/tgui/packages/tgui/interfaces/NtosRoboControl.js b/tgui/packages/tgui/interfaces/NtosRoboControl.js index 511e63c4b86..b365e878f5a 100644 --- a/tgui/packages/tgui/interfaces/NtosRoboControl.js +++ b/tgui/packages/tgui/interfaces/NtosRoboControl.js @@ -16,8 +16,7 @@ export const NtosRoboControl = (props, context) => { return ( + height={550}>
    diff --git a/tgui/packages/tgui/interfaces/NtosShipping.js b/tgui/packages/tgui/interfaces/NtosShipping.js index 0ff0704cd16..5769827dfa6 100644 --- a/tgui/packages/tgui/interfaces/NtosShipping.js +++ b/tgui/packages/tgui/interfaces/NtosShipping.js @@ -7,8 +7,7 @@ export const NtosShipping = (props, context) => { return ( + height={350}>
    { return ( + height={500}> diff --git a/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js b/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js index 2a711d6f3d3..f2a70487fa4 100644 --- a/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js +++ b/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js @@ -12,8 +12,7 @@ export const NtosSupermatterMonitor = (props, context) => { return ( + height={350}> diff --git a/tgui/packages/tgui/interfaces/OperatingComputer.js b/tgui/packages/tgui/interfaces/OperatingComputer.js index a9842e40f10..455c035de04 100644 --- a/tgui/packages/tgui/interfaces/OperatingComputer.js +++ b/tgui/packages/tgui/interfaces/OperatingComputer.js @@ -26,8 +26,7 @@ export const OperatingComputer = (props, context) => { return ( + height={470}> { return ( + height={415}>
    { + height={550}>
    diff --git a/tgui/packages/tgui/interfaces/Pandemic.js b/tgui/packages/tgui/interfaces/Pandemic.js index 71b0adb1b8d..62c2cc61c74 100644 --- a/tgui/packages/tgui/interfaces/Pandemic.js +++ b/tgui/packages/tgui/interfaces/Pandemic.js @@ -271,8 +271,7 @@ export const Pandemic = (props, context) => { return ( + height={550}> {!!data.has_blood && ( diff --git a/tgui/packages/tgui/interfaces/PaperSheet.js b/tgui/packages/tgui/interfaces/PaperSheet.js index c957a7a4d12..17c65b82d12 100644 --- a/tgui/packages/tgui/interfaces/PaperSheet.js +++ b/tgui/packages/tgui/interfaces/PaperSheet.js @@ -604,8 +604,7 @@ export const PaperSheet = (props, context) => { title={name} theme="paper" width={sizeX || 400} - height={sizeY || 500} - resizable> + height={sizeY || 500}> diff --git a/tgui/packages/tgui/interfaces/PersonalCrafting.js b/tgui/packages/tgui/interfaces/PersonalCrafting.js index 6c9e01203fb..c59cd5ead32 100644 --- a/tgui/packages/tgui/interfaces/PersonalCrafting.js +++ b/tgui/packages/tgui/interfaces/PersonalCrafting.js @@ -60,8 +60,7 @@ export const PersonalCrafting = (props, context) => { + height={800}> {!!busy && ( diff --git a/tgui/packages/tgui/interfaces/PortableChemMixer.js b/tgui/packages/tgui/interfaces/PortableChemMixer.js index da1b8228725..4843d02b3a9 100644 --- a/tgui/packages/tgui/interfaces/PortableChemMixer.js +++ b/tgui/packages/tgui/interfaces/PortableChemMixer.js @@ -21,8 +21,7 @@ export const PortableChemMixer = (props, context) => { return ( + height={550}>
    { return ( + height={340}> {!data.anchored && ( Generator not anchored. diff --git a/tgui/packages/tgui/interfaces/PortableScrubber.js b/tgui/packages/tgui/interfaces/PortableScrubber.js index 6cfc4e07463..a239b3f4271 100644 --- a/tgui/packages/tgui/interfaces/PortableScrubber.js +++ b/tgui/packages/tgui/interfaces/PortableScrubber.js @@ -10,7 +10,7 @@ export const PortableScrubber = (props, context) => { return ( + height={396}>
    diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.js b/tgui/packages/tgui/interfaces/PowerMonitor.js index e2606b6300d..89b1ad94c60 100644 --- a/tgui/packages/tgui/interfaces/PowerMonitor.js +++ b/tgui/packages/tgui/interfaces/PowerMonitor.js @@ -17,8 +17,7 @@ export const PowerMonitor = () => { return ( + height={700}> diff --git a/tgui/packages/tgui/interfaces/RapidPipeDispenser.js b/tgui/packages/tgui/interfaces/RapidPipeDispenser.js index 6766ecb3ea5..4707b00cdfe 100644 --- a/tgui/packages/tgui/interfaces/RapidPipeDispenser.js +++ b/tgui/packages/tgui/interfaces/RapidPipeDispenser.js @@ -74,8 +74,7 @@ export const RapidPipeDispenser = (props, context) => { return ( + height={515}>
    diff --git a/tgui/packages/tgui/interfaces/RemoteRobotControl.js b/tgui/packages/tgui/interfaces/RemoteRobotControl.js index bcad68a1404..75be82c8e33 100644 --- a/tgui/packages/tgui/interfaces/RemoteRobotControl.js +++ b/tgui/packages/tgui/interfaces/RemoteRobotControl.js @@ -8,8 +8,7 @@ export const RemoteRobotControl = (props, context) => { + height={500}> diff --git a/tgui/packages/tgui/interfaces/RequestKiosk.js b/tgui/packages/tgui/interfaces/RequestKiosk.js index 55fa404146f..b7fe60e041e 100644 --- a/tgui/packages/tgui/interfaces/RequestKiosk.js +++ b/tgui/packages/tgui/interfaces/RequestKiosk.js @@ -7,8 +7,7 @@ export const RequestKiosk = (props, context) => { return ( + height={600}> diff --git a/tgui/packages/tgui/interfaces/RoboticsControlConsole.js b/tgui/packages/tgui/interfaces/RoboticsControlConsole.js index b3984b58e73..256e32a8fdc 100644 --- a/tgui/packages/tgui/interfaces/RoboticsControlConsole.js +++ b/tgui/packages/tgui/interfaces/RoboticsControlConsole.js @@ -13,8 +13,7 @@ export const RoboticsControlConsole = (props, context) => { return ( + height={460}> { return ( + height={300}> act('toggle_lock')} /> diff --git a/tgui/packages/tgui/interfaces/SeedExtractor.js b/tgui/packages/tgui/interfaces/SeedExtractor.js index 57f2db62a9d..9277ab66cbe 100644 --- a/tgui/packages/tgui/interfaces/SeedExtractor.js +++ b/tgui/packages/tgui/interfaces/SeedExtractor.js @@ -48,8 +48,7 @@ export const SeedExtractor = (props, context) => { return ( + height={400}>
    diff --git a/tgui/packages/tgui/interfaces/ShuttleManipulator.js b/tgui/packages/tgui/interfaces/ShuttleManipulator.js index 0e63d3be040..27be3ddbc8a 100644 --- a/tgui/packages/tgui/interfaces/ShuttleManipulator.js +++ b/tgui/packages/tgui/interfaces/ShuttleManipulator.js @@ -9,8 +9,7 @@ export const ShuttleManipulator = (props, context) => { + height={600}> { + height={500}>
    diff --git a/tgui/packages/tgui/interfaces/SkillStation.js b/tgui/packages/tgui/interfaces/SkillStation.js index 1f44c56d631..c3ff64ed971 100644 --- a/tgui/packages/tgui/interfaces/SkillStation.js +++ b/tgui/packages/tgui/interfaces/SkillStation.js @@ -264,8 +264,7 @@ export const SkillStation = (props, context) => { + height={500}> {!!error && ( diff --git a/tgui/packages/tgui/interfaces/SmartVend.js b/tgui/packages/tgui/interfaces/SmartVend.js index 2a1dd924dd5..1ae57e2a1ce 100644 --- a/tgui/packages/tgui/interfaces/SmartVend.js +++ b/tgui/packages/tgui/interfaces/SmartVend.js @@ -8,8 +8,7 @@ export const SmartVend = (props, context) => { return ( + height={550}>
    { + height={600}>
    {spawners.map(spawner => ( diff --git a/tgui/packages/tgui/interfaces/Stack.js b/tgui/packages/tgui/interfaces/Stack.js index 0ec12a67c29..8ba13220a70 100644 --- a/tgui/packages/tgui/interfaces/Stack.js +++ b/tgui/packages/tgui/interfaces/Stack.js @@ -35,8 +35,7 @@ export const Stack = (props, context) => { return ( + height={Math.min(height, 500)}>
    { return ( + height={340}> {!machine ? ( diff --git a/tgui/packages/tgui/interfaces/StationAlertConsole.js b/tgui/packages/tgui/interfaces/StationAlertConsole.js index a9929f92442..8773a1b6553 100644 --- a/tgui/packages/tgui/interfaces/StationAlertConsole.js +++ b/tgui/packages/tgui/interfaces/StationAlertConsole.js @@ -6,8 +6,7 @@ export const StationAlertConsole = () => { return ( + height={500}> diff --git a/tgui/packages/tgui/interfaces/SyndContractor.js b/tgui/packages/tgui/interfaces/SyndContractor.js index 629be4856f3..b6809dddaee 100644 --- a/tgui/packages/tgui/interfaces/SyndContractor.js +++ b/tgui/packages/tgui/interfaces/SyndContractor.js @@ -66,8 +66,7 @@ export const SyndContractor = (props, context) => { + theme="syndicate"> diff --git a/tgui/packages/tgui/interfaces/TachyonArray.js b/tgui/packages/tgui/interfaces/TachyonArray.js index c3d01ecf4a4..7dde7e98990 100644 --- a/tgui/packages/tgui/interfaces/TachyonArray.js +++ b/tgui/packages/tgui/interfaces/TachyonArray.js @@ -10,8 +10,7 @@ export const TachyonArray = (props, context) => { return ( + height={225}> {!records.length ? ( diff --git a/tgui/packages/tgui/interfaces/Tank.js b/tgui/packages/tgui/interfaces/Tank.js index d6b026aed1e..7b5f20b8345 100644 --- a/tgui/packages/tgui/interfaces/Tank.js +++ b/tgui/packages/tgui/interfaces/Tank.js @@ -25,7 +25,6 @@ export const Tank = (props, context) => { } = data; return ( diff --git a/tgui/packages/tgui/interfaces/Telecomms.js b/tgui/packages/tgui/interfaces/Telecomms.js index d4e2be6224d..25ea3dbf372 100644 --- a/tgui/packages/tgui/interfaces/Telecomms.js +++ b/tgui/packages/tgui/interfaces/Telecomms.js @@ -26,8 +26,7 @@ export const Telecomms = (props, context) => { const linked = data.linked || []; const frequencies = data.frequencies || []; return ( - @@ -37,17 +36,17 @@ export const Telecomms = (props, context) => { )}
    - act('toggle')} /> } /> - { value={id} onChange={(e, value) => act('id', { value })} /> } /> - { defaultValue={"tcommsat"} onChange={(e, value) => act('network', { value })} /> } /> - @@ -90,7 +89,7 @@ export const Telecomms = (props, context) => { inline color={RADIO_CHANNELS .find(channel => channel.freq === changefrequency) - .color} + .color} ml={2}> [{RADIO_CHANNELS .find(channel => channel @@ -109,13 +108,13 @@ export const Telecomms = (props, context) => { onChange={(e, value) => act( 'change_freq', { value })} /> -
    +
    )} {(type === 'relay') && ( @@ -140,7 +139,7 @@ export const Telecomms = (props, context) => { {entry.index}. {entry.id} ({entry.name}) {!!multitool && ( -
    )} - + )}     diff --git a/tgui/packages/tgui/interfaces/TrackedPlaytime.js b/tgui/packages/tgui/interfaces/TrackedPlaytime.js index 873dac16c67..d6ee9c01775 100644 --- a/tgui/packages/tgui/interfaces/TrackedPlaytime.js +++ b/tgui/packages/tgui/interfaces/TrackedPlaytime.js @@ -12,12 +12,10 @@ const PlaytimeSection = props => { const { playtimes } = props; const sortedPlaytimes = sortByPlaytime(Object.entries(playtimes)); const mostPlayed = sortedPlaytimes[0][1]; - return ( {sortedPlaytimes.map(([jobName, playtime]) => { const ratio = playtime / mostPlayed; - return ( { }}> {jobName} - - {(playtime / 60).toLocaleString(undefined, { "minimumFractionDigits": 1, @@ -55,17 +51,14 @@ export const TrackedPlaytime = (props, context) => { failReason, jobPlaytimes, specialPlaytimes, - livingTime, ghostTime, } = data; - return ( + height={650}> {failReason && ( failReason === JOB_REPORT_MENU_FAIL_REASON_TRACKING_DISABLED @@ -82,17 +75,11 @@ export const TrackedPlaytime = (props, context) => { }} /> -
    - +
    -
    - +
    )} diff --git a/tgui/packages/tgui/interfaces/Uplink.js b/tgui/packages/tgui/interfaces/Uplink.js index 53c0805e009..c963a8f2001 100644 --- a/tgui/packages/tgui/interfaces/Uplink.js +++ b/tgui/packages/tgui/interfaces/Uplink.js @@ -13,8 +13,7 @@ export const Uplink = (props, context) => { + theme="syndicate"> { + height={600}> {!!onstation && (
    diff --git a/tgui/packages/tgui/layouts/NtosWindow.js b/tgui/packages/tgui/layouts/NtosWindow.js index 96df67147e9..325f89a4a46 100644 --- a/tgui/packages/tgui/layouts/NtosWindow.js +++ b/tgui/packages/tgui/layouts/NtosWindow.js @@ -14,7 +14,6 @@ export const NtosWindow = (props, context) => { title, width = 575, height = 700, - resizable, theme = 'ntos', children, } = props; @@ -35,8 +34,7 @@ export const NtosWindow = (props, context) => { title={title} width={width} height={height} - theme={theme} - resizable={resizable}> + theme={theme}>
    diff --git a/tgui/packages/tgui/layouts/Window.js b/tgui/packages/tgui/layouts/Window.js index a730aaa7e3c..5a8cc3d2e88 100644 --- a/tgui/packages/tgui/layouts/Window.js +++ b/tgui/packages/tgui/layouts/Window.js @@ -23,11 +23,26 @@ const DEFAULT_SIZE = [400, 600]; export class Window extends Component { componentDidMount() { - const { config, suspended } = useBackend(this.context); + const { suspended } = useBackend(this.context); if (suspended) { return; } logger.log('mounting'); + this.updateGeometry(); + } + + componentDidUpdate(prevProps) { + const shouldUpdateGeometry = ( + this.props.width !== prevProps.width + || this.props.height !== prevProps.height + ); + if (shouldUpdateGeometry) { + this.updateGeometry(); + } + } + + updateGeometry() { + const { config } = useBackend(this.context); const options = { size: DEFAULT_SIZE, ...config.window, @@ -43,7 +58,6 @@ export class Window extends Component { render() { const { - resizable, noClose, theme, title, @@ -87,7 +101,7 @@ export class Window extends Component {
    )}
    - {fancy && resizable && ( + {fancy && ( <>
    diff --git a/tgui/packages/tgui/routes.js b/tgui/packages/tgui/routes.js index 1740587e439..34462f314ee 100644 --- a/tgui/packages/tgui/routes.js +++ b/tgui/packages/tgui/routes.js @@ -12,7 +12,7 @@ const requireInterface = require.context('./interfaces', false, /\.js$/); const routingError = (type, name) => () => { return ( - + {type === 'notFound' && (
    Interface {name} was not found.
    @@ -27,7 +27,7 @@ const routingError = (type, name) => () => { const SuspendedWindow = () => { return ( - + ); diff --git a/tgui/packages/tgui/stories/Storage.stories.js b/tgui/packages/tgui/stories/Storage.stories.js index 17bed80afca..f00899f1db7 100644 --- a/tgui/packages/tgui/stories/Storage.stories.js +++ b/tgui/packages/tgui/stories/Storage.stories.js @@ -4,6 +4,7 @@ * @license MIT */ +import { storage } from 'common/storage'; import { Button, LabeledList, NoticeBox, Section } from '../components'; import { formatSiUnit } from '../format'; @@ -28,6 +29,7 @@ const Story = (props, context) => { icon="recycle" onClick={() => { localStorage.clear(); + storage.clear(); }}> Clear