tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uichange Fix Grinder (#14234)

Browse Source
This commit is contained in:
DEATHB4DEFEAT
2023-03-25 07:51:35 -07:00
committed by GitHub
parent 32cce0d938
commit 7c21494a6a
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Client/Kitchen/UI/GrinderMenu.xaml
View File

@@ -1,15 +1,16 @@
<DefaultWindow xmlns="https://spacestation14.io" <controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.Kitchen.UI" xmlns:ui="clr-namespace:Content.Client.Kitchen.UI"
Title="{Loc grinder-menu-title}" MinSize="512 256" SetSize="512 256"> xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
<BoxContainer Orientation="Horizontal"> Title="{Loc grinder-menu-title}" MinSize="768 256">
<BoxContainer Orientation="Vertical" VerticalAlignment="Center"> <BoxContainer Orientation="Horizontal">
<Button Name="GrindButton" Text="{Loc grinder-menu-grind-button}" TextAlign="Center" MinSize="64 64"/> <BoxContainer Orientation="Vertical" VerticalAlignment="Top" Margin="8">
<Button Name="GrindButton" Text="{Loc grinder-menu-grind-button}" TextAlign="Center" MinSize="64 48"/>
<Control MinSize="0 16"/> <Control MinSize="0 16"/>
<Button Name="JuiceButton" Text="{Loc grinder-menu-juice-button}" TextAlign="Center" MinSize="64 64"/> <Button Name="JuiceButton" Text="{Loc grinder-menu-juice-button}" TextAlign="Center" MinSize="64 48"/>
</BoxContainer> </BoxContainer>
<Control MinSize="16 0"/>
<ui:LabelledContentBox Name="ChamberContentBox" LabelText="{Loc grinder-menu-chamber-content-box-label}" ButtonText="{Loc grinder-menu-chamber-content-box-button}" VerticalExpand="True" HorizontalExpand="True" SizeFlagsStretchRatio="2"/> <ui:LabelledContentBox Name="ChamberContentBox" LabelText="{Loc grinder-menu-chamber-content-box-label}" ButtonText="{Loc grinder-menu-chamber-content-box-button}" VerticalExpand="True" HorizontalExpand="True" Margin="8" SizeFlagsStretchRatio="2"/>
<Control MinSize="8 0"/>
<ui:LabelledContentBox Name="BeakerContentBox" LabelText="{Loc grinder-menu-beaker-content-box-label}" ButtonText="{Loc grinder-menu-beaker-content-box-button}" VerticalExpand="True" HorizontalExpand="True" SizeFlagsStretchRatio="2"/> <ui:LabelledContentBox Name="BeakerContentBox" LabelText="{Loc grinder-menu-beaker-content-box-label}" ButtonText="{Loc grinder-menu-beaker-content-box-button}" VerticalExpand="True" HorizontalExpand="True" Margin="8" SizeFlagsStretchRatio="2"/>
</BoxContainer> </BoxContainer>
</DefaultWindow> </controls:FancyWindow>

3
Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
View File

@@ -1,3 +1,4 @@
using Content.Client.UserInterface.Controls;
using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
using Content.Shared.Kitchen; using Content.Shared.Kitchen;
@@ -11,7 +12,7 @@ using Robust.Shared.Prototypes;
namespace Content.Client.Kitchen.UI namespace Content.Client.Kitchen.UI
{ {
[GenerateTypedNameReferences] [GenerateTypedNameReferences]
public sealed partial class GrinderMenu : DefaultWindow public sealed partial class GrinderMenu : FancyWindow
{ {
private readonly IEntityManager _entityManager; private readonly IEntityManager _entityManager;
private readonly IPrototypeManager _prototypeManager ; private readonly IPrototypeManager _prototypeManager ;

2
Content.Client/Kitchen/UI/LabelledContentBox.xaml
View File

@@ -1,5 +1,5 @@
<BoxContainer Orientation="Vertical" xmlns="https://spacestation14.io"> <BoxContainer Orientation="Vertical" xmlns="https://spacestation14.io">
<SplitContainer Orientation="Horizontal"> <SplitContainer Orientation="Horizontal" Margin="5">
<Label Name="Label" Align="Center"/> <Label Name="Label" Align="Center"/>
<Button Name="EjectButton" Access="Public" TextAlign="Center"/> <Button Name="EjectButton" Access="Public" TextAlign="Center"/>
</SplitContainer> </SplitContainer>