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

Remove encapsulation for previously protected XAML UI fields (#4975)

Browse Source
This commit is contained in:
Visne
2021-10-28 14:23:17 +02:00
committed by GitHub
parent aed66cfc48
commit ac78145b94
49 changed files with 158 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/MainMenu/MainMenu.cs
View File

@@ -99,7 +99,7 @@ namespace Content.Client.MainMenu
private void TryConnect(string address)
{
var inputName = _mainMenuControl.UserNameBox.Text.Trim();
var inputName = _mainMenuControl.UsernameBox.Text.Trim();
if (!UsernameHelpers.IsNameValid(inputName, out var reason))
{
var invalidReason = Loc.GetString(reason.ToText());
@@ -110,7 +110,7 @@ namespace Content.Client.MainMenu
}
var configName = _configurationManager.GetCVar(CVars.PlayerName);
if (_mainMenuControl.UserNameBox.Text != configName)
if (_mainMenuControl.UsernameBox.Text != configName)
{
_configurationManager.SetCVar(CVars.PlayerName, inputName);
_configurationManager.SaveToFile();

18
Content.Client/MainMenu/UI/MainMenuControl.xaml
View File

@@ -11,29 +11,35 @@
<BoxContainer Orientation="Horizontal"
SeparationOverride="4">
<Label Text="{Loc 'main-menu-username-label'}" />
<LineEdit Name="UsernameBoxProtected"
<LineEdit Name="UsernameBox"
Access="Public"
PlaceHolder="{Loc 'main-menu-username-text'}"
HorizontalExpand="True" />
</BoxContainer>
<Button Name="JoinPublicServerButtonProtected"
<Button Name="JoinPublicServerButton"
Access="Public"
Text="{Loc 'main-menu-join-public-server-button'}"
StyleIdentifier="mainMenu"
TextAlign="Center" />
<Control MinSize="0 2" />
<LineEdit Name="AddressBoxProtected"
<LineEdit Name="AddressBox"
Access="Public"
Text="localhost"
PlaceHolder="server address:port"
HorizontalExpand="True" />
<Button Name="DirectConnectButtonProtected"
<Button Name="DirectConnectButton"
Access="Public"
Text="{Loc 'main-menu-direct-connect-button'}"
TextAlign="Center"
StyleIdentifier="mainMenu" />
<Control MinSize="0 2" />
<Button Name="OptionsButtonProtected"
<Button Name="OptionsButton"
Access="Public"
Text="{Loc 'main-menu-options-button'}"
TextAlign="Center"
StyleIdentifier="mainMenu" />
<Button Name="QuitButtonProtected"
<Button Name="QuitButton"
Access="Public"
Text="{Loc 'main-menu-quit-button'}"
TextAlign="Center"
StyleIdentifier="mainMenu" />

9
Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
View File

@@ -14,13 +14,6 @@ namespace Content.Client.MainMenu.UI
[GenerateTypedNameReferences]
public partial class MainMenuControl : Control
{
public LineEdit UserNameBox => UsernameBoxProtected;
public Button JoinPublicServerButton => JoinPublicServerButtonProtected;
public LineEdit AddressBox => AddressBoxProtected;
public Button DirectConnectButton => DirectConnectButtonProtected;
public Button OptionsButton => OptionsButtonProtected;
public Button QuitButton => QuitButtonProtected;
public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
{
RobustXamlLoader.Load(this);
@@ -36,7 +29,7 @@ namespace Content.Client.MainMenu.UI
Logo.Texture = logoTexture;
var currentUserName = configMan.GetCVar(CVars.PlayerName);
UserNameBox.Text = currentUserName;
UsernameBox.Text = currentUserName;
#if !FULL_RELEASE
JoinPublicServerButton.Disabled = true;