Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'WD-core/master' into upstream-core

Browse Source
This commit is contained in:
BIGZi0348
2024-12-14 22:13:35 +03:00
parent 56af018041 6ed1051d94
commit a45e85ebe4
30 changed files with 384 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
View File

@@ -15,6 +15,7 @@ namespace Content.Client.VendingMachines
[ViewVariables]
private List<int> _cachedFilteredIndex = new();
private VendingMachineComponent component = new(); // WD edit
public VendingMachineBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
{
}
@@ -26,7 +27,7 @@ namespace Content.Client.VendingMachines
var vendingMachineSys = EntMan.System<VendingMachineSystem>();
// WD EDIT START
var component = EntMan.GetComponent<VendingMachineComponent>(Owner);
component = EntMan.GetComponent<VendingMachineComponent>(Owner);
_cachedInventory = vendingMachineSys.GetAllInventory(Owner, component);
_menu = new VendingMenu { Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName };
@@ -34,6 +35,7 @@ namespace Content.Client.VendingMachines
_menu.OnClose += Close;
_menu.OnItemSelected += OnItemSelected;
_menu.OnWithdraw += SendMessage;
_menu.SearchBar.OnTextChanged += UpdateFilter;
// WD EDIT END
_menu.Populate(_cachedInventory, component.PriceMultiplier, component.Credits);
@@ -41,6 +43,17 @@ namespace Content.Client.VendingMachines
_menu.OpenCenteredLeft();
}
// WD EDIT START
private void UpdateFilter(Robust.Client.UserInterface.Controls.LineEdit.LineEditEventArgs obj)
{
if (_menu != null)
{
_menu.filter = obj.Text;
_menu.Populate(_cachedInventory, component.PriceMultiplier, component.Credits);
}
}
// WD EDIT END
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
@@ -84,7 +97,7 @@ namespace Content.Client.VendingMachines
private void OnSearchChanged(string? filter)
{
//_menu?.Populate(_cachedInventory, out _cachedFilteredIndex, filter);
//_menu?.filter = (filter ?? "");
}
}
}

8
Content.Client/_White/Economy/Ui/VendingMenu.xaml
View File

@@ -1,4 +1,7 @@
<DefaultWindow xmlns="https://spacestation14.io">
<DefaultWindow 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="Horizontal">
<Label Name="CreditsLabel" HorizontalExpand="True"/>
@@ -7,6 +10,9 @@
Text="{Loc 'store-ui-default-withdraw-text'}"
HorizontalAlignment="Right"/>
</BoxContainer>
<BoxContainer Orientation="Horizontal">
<LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True" Margin ="4 4" Access="Public"/>
</BoxContainer>
<PanelContainer StyleClasses="HighDivider" />
<Label
Name="OutOfStockLabel"

13
Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs
View File

@@ -16,12 +16,13 @@ public sealed partial class VendingMenu : DefaultWindow
public event Action<int>? OnItemSelected;
public Action<VendingMachineWithdrawMessage>? OnWithdraw;
public string filter = "";
public VendingMenu()
{
MinSize = SetSize = new Vector2(250, 150);
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
// SearchBar.OnTextChanged += UpdateFilter;
}
/// <summary>
@@ -38,7 +39,7 @@ public sealed partial class VendingMenu : DefaultWindow
return;
OnWithdraw?.Invoke(new VendingMachineWithdrawMessage());
};
VendingContents.RemoveAllChildren();
if (inventory.Count == 0)
{
@@ -67,13 +68,15 @@ public sealed partial class VendingMenu : DefaultWindow
if (itemName.Length > longestEntry.Length)
longestEntry = itemName;
var price = (int)(entry.Price * priceMultiplier);
var price = (int) (entry.Price * priceMultiplier);
var vendingItem = new VendingItem($"{itemName} [{entry.Amount}]", price > 0 ? $"{price} \u00a2" : "выдать", icon);
var j = i;
vendingItem.VendingItemBuyButton.OnPressed += _ => { OnItemSelected?.Invoke(j); };
VendingContents.AddChild(vendingItem);
if (filter == "" || (prototype?.Name?.Contains(filter) == true))
VendingContents.AddChild(vendingItem);
}
SetSizeAfterUpdate(longestEntry.Length);
@@ -84,4 +87,4 @@ public sealed partial class VendingMenu : DefaultWindow
SetSize = new Vector2(Math.Clamp((longestEntryLength + 10) * 12, 250, 700),
Math.Clamp(VendingContents.ChildCount * 50, 150, 400));
}
}
}