перенос файлов клиента из папки White в _White
This commit is contained in:
@@ -1,7 +1,4 @@
|
||||
<Control
|
||||
xmlns="https://spacestation14.io"
|
||||
xmlns:controls="clr-namespace:Content.Client._White.UserInterface.Radial">
|
||||
|
||||
<Control xmlns="https://spacestation14.io">
|
||||
<BoxContainer>
|
||||
<TextureButton
|
||||
Name="Controller"
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<controls:RadialContainer
|
||||
<radial1:RadialContainer
|
||||
xmlns="https://spacestation14.io"
|
||||
xmlns:controls="clr-namespace:Content.Client._White.UserInterface.Radial"
|
||||
xmlns:radial1="clr-namespace:Content.Client._White.UserInterface.Radial"
|
||||
Visible="False"
|
||||
MaxSize="0 0">
|
||||
<BoxContainer>
|
||||
<controls:RadialButton
|
||||
<radial1:RadialButton
|
||||
Name="CloseButton"
|
||||
Access="Public"
|
||||
VerticalExpand="True"
|
||||
@@ -14,4 +14,4 @@
|
||||
<LayoutContainer Access="Public" Name="Layout" HorizontalExpand="True" VerticalExpand="True"></LayoutContainer>
|
||||
<RichTextLabel Access="Public" Name="ActionLabel" HorizontalExpand="True" Visible="False"/>
|
||||
</BoxContainer>
|
||||
</controls:RadialContainer>
|
||||
</radial1:RadialContainer>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using System.Linq;
|
||||
using System.Numerics;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Content.Client.Message;
|
||||
using Content.Client.Resources;
|
||||
using Robust.Client.Animations;
|
||||
@@ -222,7 +221,7 @@ public partial class RadialContainer : Control
|
||||
button.Controller.OnMouseEntered += (_) =>
|
||||
{
|
||||
PlaySizeAnimation(button, _focusSize, OutSizeAnimationKey, InSizeAnimationKey);
|
||||
ActionLabel.SetMarkup(button.Content ?? string.Empty);
|
||||
RichTextLabelExt.SetMarkup(ActionLabel, button.Content ?? string.Empty);
|
||||
ActionLabel.Visible = IsAction;
|
||||
};
|
||||
button.Controller.OnMouseExited += (_) =>
|
||||
@@ -237,7 +236,7 @@ public partial class RadialContainer : Control
|
||||
CloseButton.Controller.OnMouseEntered += (_) =>
|
||||
{
|
||||
PlaySizeAnimation(CloseButton, _focusSize, OutSizeAnimationKey, InSizeAnimationKey);
|
||||
ActionLabel.SetMarkup(CloseButton.Content ?? string.Empty);
|
||||
RichTextLabelExt.SetMarkup(ActionLabel, CloseButton.Content ?? string.Empty);
|
||||
ActionLabel.Visible = true;
|
||||
};
|
||||
|
||||
@@ -405,10 +404,10 @@ public partial class RadialContainer : Control
|
||||
{
|
||||
var distance = FocusSize * 1.2f;
|
||||
|
||||
if (Layout.Children.Count() <= MaxButtons)
|
||||
if (Enumerable.Count<Control>(Layout.Children) <= MaxButtons)
|
||||
return distance + offset;
|
||||
|
||||
for (var i = 0; i < (Layout.Children.Count() - MaxButtons); i++)
|
||||
for (var i = 0; i < (Enumerable.Count<Control>(Layout.Children) - MaxButtons); i++)
|
||||
{
|
||||
distance += (NormalSize/3);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user