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

Vending UI facelift (#25377)

Browse Source 
* Convert to fancy window + added footer + add list spacing

* margin add
This commit is contained in:
James Simonson
2024-02-20 06:18:26 +08:00
committed by GitHub
parent e74f3019f7
commit 99aa72e30d
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
View File

@@ -1,10 +1,28 @@
<DefaultWindow xmlns="https://spacestation14.io"> <controls:FancyWindow
xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:style="clr-namespace:Content.Client.Stylesheets">
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True" Margin ="0 4" Access="Public"/> <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True" Margin ="4 4" Access="Public"/>
<ItemList Name="VendingContents" <ItemList Name="VendingContents"
SizeFlagsStretchRatio="8" SizeFlagsStretchRatio="8"
VerticalExpand="True" VerticalExpand="True"
SelectMode="Button"> ItemSeparation="2"
Margin="4 0"
SelectMode="Button"
StyleClasses="transparentBackgroundItemList">
</ItemList> </ItemList>
<!-- Footer -->
<BoxContainer Orientation="Vertical">
<PanelContainer StyleClasses="LowDivider" />
<BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
<Label Text="{Loc 'vending-machine-flavor-left'}" StyleClasses="WindowFooterText" />
<Label Text="{Loc 'vending-machine-flavor-right'}" StyleClasses="WindowFooterText"
HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 5 0" />
<TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
</BoxContainer>
</BoxContainer>
</BoxContainer> </BoxContainer>
</DefaultWindow> </controls:FancyWindow>

5
Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
View File

@@ -4,14 +4,15 @@ using Robust.Client.AutoGenerated;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls; using Content.Client.Stylesheets;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
namespace Content.Client.VendingMachines.UI namespace Content.Client.VendingMachines.UI
{ {
[GenerateTypedNameReferences] [GenerateTypedNameReferences]
public sealed partial class VendingMachineMenu : DefaultWindow public sealed partial class VendingMachineMenu : FancyWindow
{ {
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;

2
Resources/Locale/en-US/vending-machines/vending-machine.ftl
View File

@@ -1 +1,3 @@
vending-machine-thanks = Thanks for using { $name }! vending-machine-thanks = Thanks for using { $name }!
vending-machine-flavor-left = Request refills at cargo
vending-machine-flavor-right = v1.1