Remove some BUI boilerplate (#28399)
* Remove some BUI boilerplate - The disposals overrides got removed due to the helper method handling it. - Replace window creation with CreateWindow helper. - Fixed some stinky code which would cause exceptions. * More * moar * weh * done * More BUIs * More updates * weh * moar * look who it is * weh * merge * weh * fixes
This commit is contained in:
@@ -9,22 +9,20 @@ namespace Content.Client.Kitchen.UI
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class MicrowaveMenu : FancyWindow
|
||||
{
|
||||
public sealed class MicrowaveCookTimeButton : Button
|
||||
{
|
||||
public uint CookTime;
|
||||
}
|
||||
[Dependency] private readonly IGameTiming _timing = default!;
|
||||
|
||||
public event Action<BaseButton.ButtonEventArgs, int>? OnCookTimeSelected;
|
||||
|
||||
public ButtonGroup CookTimeButtonGroup { get; }
|
||||
private readonly MicrowaveBoundUserInterface _owner;
|
||||
|
||||
public MicrowaveMenu(MicrowaveBoundUserInterface owner)
|
||||
public bool IsBusy;
|
||||
public TimeSpan CurrentCooktimeEnd;
|
||||
|
||||
public MicrowaveMenu()
|
||||
{
|
||||
RobustXamlLoader.Load(this);
|
||||
CookTimeButtonGroup = new ButtonGroup();
|
||||
InstantCookButton.Group = CookTimeButtonGroup;
|
||||
_owner = owner;
|
||||
InstantCookButton.OnPressed += args =>
|
||||
{
|
||||
OnCookTimeSelected?.Invoke(args, 0);
|
||||
@@ -65,14 +63,20 @@ namespace Content.Client.Kitchen.UI
|
||||
protected override void FrameUpdate(FrameEventArgs args)
|
||||
{
|
||||
base.FrameUpdate(args);
|
||||
if(!_owner.currentState.IsMicrowaveBusy)
|
||||
|
||||
if (!IsBusy)
|
||||
return;
|
||||
|
||||
if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime())
|
||||
if (CurrentCooktimeEnd > _timing.CurTime)
|
||||
{
|
||||
CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
|
||||
("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds));
|
||||
("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds));
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MicrowaveCookTimeButton : Button
|
||||
{
|
||||
public uint CookTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user