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

правочки

Browse Source
This commit is contained in:
BIGZi0348
2024-12-02 20:15:00 +03:00
parent ef4d440bf7
commit 38e39d7ccf
7 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml
View File

@@ -4,7 +4,6 @@
<BoxContainer Name="Buttons" <BoxContainer Name="Buttons"
Orientation="Vertical" Orientation="Vertical"
SeparationOverride="5"> SeparationOverride="5">
<!-- Updated before upstream!!! -->
<!-- Buttons are added here by code --> <!-- Buttons are added here by code -->
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>

8
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs
View File

@@ -1,4 +1,4 @@
using System.Numerics; // Updated before upstream using System.Numerics;
using Content.Shared.Ghost.Roles; using Content.Shared.Ghost.Roles;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
@@ -10,13 +10,13 @@ using Robust.Shared.Utility;
namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
{ {
[GenerateTypedNameReferences] [GenerateTypedNameReferences]
public sealed partial class GhostRoleButtonsBox : BoxContainer public sealed partial class GhostRoleButtonsBox : BoxContainer // WD Edit ahead of wizden upstream
{ {
private SpriteSystem _spriteSystem; private SpriteSystem _spriteSystem;
public event Action<GhostRoleInfo>? OnRoleSelected; public event Action<GhostRoleInfo>? OnRoleSelected;
public event Action<GhostRoleInfo>? OnRoleFollow; public event Action<GhostRoleInfo>? OnRoleFollow;
public GhostRoleButtonsBox(bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem) public GhostRoleButtonsBox(bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem) // WD Edit ahead of wizden upstream
{ {
RobustXamlLoader.Load(this); RobustXamlLoader.Load(this);
_spriteSystem = spriteSystem; _spriteSystem = spriteSystem;
@@ -42,7 +42,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
{ {
TextureScale = new Vector2(0.4f, 0.4f), TextureScale = new Vector2(0.4f, 0.4f),
Stretch = TextureRect.StretchMode.KeepCentered, Stretch = TextureRect.StretchMode.KeepCentered,
Texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ("/Textures/Interface/Nano/lock.svg.192dpi.png"))), Texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new("/Textures/Interface/Nano/lock.svg.192dpi.png"))),
HorizontalExpand = true, HorizontalExpand = true,
HorizontalAlignment = HAlignment.Right, HorizontalAlignment = HAlignment.Right,
}); });

1
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
View File

@@ -1,7 +1,6 @@
<BoxContainer xmlns="https://spacestation14.io" <BoxContainer xmlns="https://spacestation14.io"
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
<!-- Updated before upstream!!! -->
<Button Name="RequestButton" <Button Name="RequestButton"
Access="Public" Access="Public"
Text="{Loc 'ghost-roles-window-request-role-button'}" Text="{Loc 'ghost-roles-window-request-role-button'}"

1
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml
View File

@@ -1,6 +1,5 @@
<BoxContainer xmlns="https://spacestation14.io" <BoxContainer xmlns="https://spacestation14.io"
Orientation="Vertical"> Orientation="Vertical">
<!-- Updated before upstream!!! -->
<Label Name="Title" <Label Name="Title"
StyleClasses="LabelKeyText"/> StyleClasses="LabelKeyText"/>
<PanelContainer StyleClasses="HighDivider" /> <PanelContainer StyleClasses="HighDivider" />

2
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs
View File

@@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated; // Updated before upstream using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;

4
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; // Updated before upstream using System.Linq;
using Content.Client.Eui; using Content.Client.Eui;
using Content.Client.Players.PlayTimeTracking; using Content.Client.Players.PlayTimeTracking;
using Content.Shared.Eui; using Content.Shared.Eui;
@@ -9,7 +9,7 @@ using Robust.Client.GameObjects;
namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
{ {
[UsedImplicitly] [UsedImplicitly]
public sealed class GhostRolesEui : BaseEui public sealed class GhostRolesEui : BaseEui // WD Edit ahead of wizden upstream
{ {
private readonly GhostRolesWindow _window; private readonly GhostRolesWindow _window;
private GhostRoleRulesWindow? _windowRules = null; private GhostRoleRulesWindow? _windowRules = null;

4
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; // Updated before upstream using System.Linq;
using Content.Shared.Ghost.Roles; using Content.Shared.Ghost.Roles;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
@@ -10,7 +10,7 @@ using Robust.Shared.Utility;
namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
{ {
[GenerateTypedNameReferences] [GenerateTypedNameReferences]
public sealed partial class GhostRolesWindow : DefaultWindow public sealed partial class GhostRolesWindow : DefaultWindow // WD Edit ahead of wizden upstream
{ {
public event Action<GhostRoleInfo>? OnRoleRequestButtonClicked; public event Action<GhostRoleInfo>? OnRoleRequestButtonClicked;
public event Action<GhostRoleInfo>? OnRoleFollow; public event Action<GhostRoleInfo>? OnRoleFollow;