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

Remove stack item status flicker (#6613)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-13 11:18:18 +13:00
committed by GitHub
parent b962ac43df
commit 29ff523081
6 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Atmos/Components/GasAnalyzerComponent.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Client.Atmos.Components
_label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } }; _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
AddChild(_label); AddChild(_label);
parent._uiUpdateNeeded = true; Update();
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -56,6 +56,11 @@ namespace Content.Client.Atmos.Components
return; return;
} }
Update();
}
public void Update()
{
_parent._uiUpdateNeeded = false; _parent._uiUpdateNeeded = false;
var color = _parent.Danger switch var color = _parent.Danger switch

7
Content.Client/Chemistry/Components/HyposprayComponent.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Client.Chemistry.Components
_label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}}; _label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
AddChild(_label); AddChild(_label);
parent._uiUpdateNeeded = true; Update();
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -57,6 +57,11 @@ namespace Content.Client.Chemistry.Components
{ {
return; return;
} }
Update();
}
public void Update()
{
_parent._uiUpdateNeeded = false; _parent._uiUpdateNeeded = false;

6
Content.Client/Chemistry/Components/InjectorComponent.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Client.Chemistry.Components
_label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } }; _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
AddChild(_label); AddChild(_label);
parent._uiUpdateNeeded = true; Update();
} }
protected override void FrameUpdate(FrameEventArgs args) protected override void FrameUpdate(FrameEventArgs args)
@@ -66,7 +66,11 @@ namespace Content.Client.Chemistry.Components
{ {
return; return;
} }
Update();
}
public void Update()
{
_parent._uiUpdateNeeded = false; _parent._uiUpdateNeeded = false;
//Update current volume and injector state //Update current volume and injector state

9
Content.Client/Stack/StackComponent.cs
View File

@@ -4,17 +4,13 @@ using Content.Client.Stylesheets;
using Content.Shared.Stacks; using Content.Shared.Stacks;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
namespace Content.Client.Stack namespace Content.Client.Stack
{ {
[RegisterComponent, Friend(typeof(StackSystem), typeof(StatusControl))] [RegisterComponent, Friend(typeof(StackSystem), typeof(StatusControl))]
[ComponentReference(typeof(SharedStackComponent))] [ComponentReference(typeof(SharedStackComponent))]
public class StackComponent : SharedStackComponent, IItemStatus public sealed class StackComponent : SharedStackComponent, IItemStatus
{ {
[ViewVariables] [ViewVariables]
public bool UiUpdateNeeded { get; set; } public bool UiUpdateNeeded { get; set; }
@@ -33,9 +29,8 @@ namespace Content.Client.Stack
{ {
_parent = parent; _parent = parent;
_label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}}; _label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
_label.SetMarkup(Loc.GetString("comp-stack-status", ("count", _parent.Count)));
AddChild(_label); AddChild(_label);
parent.UiUpdateNeeded = true;
} }
protected override void FrameUpdate(FrameEventArgs args) protected override void FrameUpdate(FrameEventArgs args)

6
Content.Client/Tools/Components/MultipleToolComponent.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Client.Tools.Components
_label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}}; _label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
AddChild(_label); AddChild(_label);
parent._uiUpdateNeeded = true; UpdateDraw();
} }
protected override void FrameUpdate(FrameEventArgs args) protected override void FrameUpdate(FrameEventArgs args)
@@ -58,7 +58,11 @@ namespace Content.Client.Tools.Components
{ {
return; return;
} }
Update();
}
public void Update()
{
_parent._uiUpdateNeeded = false; _parent._uiUpdateNeeded = false;
_label.SetMarkup(_parent.StatusShowBehavior ? _parent.Behavior ?? string.Empty : string.Empty); _label.SetMarkup(_parent.StatusShowBehavior ? _parent.Behavior ?? string.Empty : string.Empty);

6
Content.Client/Tools/Components/WelderComponent.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Client.Tools.Components
_label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}}; _label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
AddChild(_label); AddChild(_label);
parent.UiUpdateNeeded = true; UpdateDraw();
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -50,7 +50,11 @@ namespace Content.Client.Tools.Components
{ {
return; return;
} }
Update();
}
public void Update()
{
_parent.UiUpdateNeeded = false; _parent.UiUpdateNeeded = false;
var fuelCap = _parent.FuelCapacity; var fuelCap = _parent.FuelCapacity;