Skip to content

Commit 0d1db2b

Browse files
committed
Add reagent container to output tab
A comment heavily implies this was either a planned feature or broken at some point or something, but it makes sense to have it shown here so we add it.
1 parent 120440c commit 0d1db2b

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

Content.Client/_Starlight/Chemistry/UI/ModernChemMasterWindow.xaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,16 @@
135135

136136
<!-- Output container reagent list + amount grid side by side -->
137137
<BoxContainer Orientation="Horizontal" VerticalExpand="True" SeparationOverride="8">
138-
138+
<PanelContainer HorizontalExpand="True" MinSize="0 140">
139+
<PanelContainer.PanelOverride>
140+
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
141+
</PanelContainer.PanelOverride>
142+
<ScrollContainer HorizontalExpand="True">
143+
<BoxContainer Name="OutputInputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
144+
<Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />
145+
</BoxContainer>
146+
</ScrollContainer>
147+
</PanelContainer>
139148
<PanelContainer HorizontalExpand="True" MinSize="0 140">
140149
<PanelContainer.PanelOverride>
141150
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
@@ -291,6 +300,16 @@
291300
</BoxContainer>
292301

293302
<BoxContainer Orientation="Horizontal" VerticalExpand="True" SeparationOverride="8">
303+
<PanelContainer HorizontalExpand="True" MinSize="0 140">
304+
<PanelContainer.PanelOverride>
305+
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
306+
</PanelContainer.PanelOverride>
307+
<ScrollContainer HorizontalExpand="True">
308+
<BoxContainer Name="OutputInputContainerInfoClassic" Orientation="Vertical" Margin="4" HorizontalExpand="True">
309+
<Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />
310+
</BoxContainer>
311+
</ScrollContainer>
312+
</PanelContainer>
294313
<PanelContainer HorizontalExpand="True" MinSize="0 140">
295314
<PanelContainer.PanelOverride>
296315
<gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />

Content.Client/_Starlight/Chemistry/UI/ModernChemMasterWindow.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,10 +588,12 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
588588
// Modern layout containers
589589
BuildContainerUI(InputContainerInfo, state.InputContainerInfo, true, modernMode: true);
590590
BuildContainerUI(OutputContainerInfo, state.OutputContainerInfo, false, modernMode: true);
591+
BuildContainerUI(OutputInputContainerInfo, state.InputContainerInfo, false, modernMode: false);
591592

592593
// Classic layout containers
593594
BuildContainerUI(InputContainerInfoClassic, state.InputContainerInfo, true, modernMode: false);
594595
BuildContainerUI(OutputContainerInfoClassic, state.OutputContainerInfo, false, modernMode: false);
596+
BuildContainerUI(OutputInputContainerInfoClassic, state.InputContainerInfo, false, modernMode: false);
595597

596598
BufferInfo.Children.Clear();
597599
BufferInfoClassic.Children.Clear();

0 commit comments

Comments
 (0)