From 42891ea3a71e3ca3dac257bb4bbf96b79dc072da Mon Sep 17 00:00:00 2001 From: 20kdc Date: Thu, 4 Nov 2021 03:22:48 +0000 Subject: [PATCH] Chem master / chem dispenser minor fixes (#5152) * Fix ChemMaster buffer view when there's no beaker in the ChemMaster * Fix reagent dispenser 100 button --- .../Chemistry/UI/ChemMasterWindow.xaml.cs | 23 ++++++++++--------- .../UI/ReagentDispenserWindow.xaml.cs | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs index 1debacec2f..5008689869 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs @@ -87,22 +87,23 @@ namespace Content.Client.Chemistry.UI if (!state.HasBeaker) { ContainerInfo.Children.Add(new Label {Text = Loc.GetString("chem-master-window-no-container-loaded-text") }); - return; } - - ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u) + else { - Orientation = LayoutOrientation.Horizontal, - Children = + ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u) { - new Label {Text = $"{state.ContainerName}: "}, - new Label + Orientation = LayoutOrientation.Horizontal, + Children = { - Text = $"{state.BeakerCurrentVolume}/{state.BeakerMaxVolume}", - StyleClasses = {StyleNano.StyleClassLabelSecondaryColor} + new Label {Text = $"{state.ContainerName}: "}, + new Label + { + Text = $"{state.BeakerCurrentVolume}/{state.BeakerMaxVolume}", + StyleClasses = {StyleNano.StyleClassLabelSecondaryColor} + } } - } - }); + }); + } foreach (var reagent in state.ContainerReagents) { diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs index 272f6e9c37..307a5bb0b2 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs @@ -42,7 +42,7 @@ namespace Content.Client.Chemistry.UI DispenseButton25.Group = dispenseAmountGroup; DispenseButton30.Group = dispenseAmountGroup; DispenseButton50.Group = dispenseAmountGroup; - DispenseButton10.Group = dispenseAmountGroup; + DispenseButton100.Group = dispenseAmountGroup; } ///