diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs index 8e4212d0b3c..421f925cdb0 100644 --- a/Content.Client/Info/LinkBanner.cs +++ b/Content.Client/Info/LinkBanner.cs @@ -57,14 +57,6 @@ public LinkBanner() // Sunrise-Start roadmapButton.OnPressed += _ => UserInterfaceManager.GetUIController().ToggleRoadmap(); buttons.AddChild(roadmapButton); - - var donateButton = new Button - { - Text = Loc.GetString("server-info-donate-button"), - Disabled = true, - }; - //donateButton.OnPressed += args => - buttons.AddChild(donateButton); // Sunrise-End void AddInfoButton(string loc, CVarDef cVar) diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index 57303086dd5..d914a1af2cb 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -10,7 +10,8 @@ xmlns:info="clr-namespace:Content.Client.Info" xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Chat.Widgets" xmlns:serversHub="clr-namespace:Content.Client._Sunrise.ServersHub" - xmlns:changelog="clr-namespace:Content.Client.Changelog"> + xmlns:changelog="clr-namespace:Content.Client.Changelog" + xmlns:userProfile="clr-namespace:Content.Client._Sunrise.UserProfile"> - - - - - - - - - - - - - - - - - - - - + + + + + + { + if (args.Function != EngineKeyFunctions.Use) + return; + + UserProfileContent.Visible = !UserProfileContent.Visible; + UserProfileHider.Texture = UserProfileContent.Visible ? IconExpanded : IconCollapsed; + }; + ServersHubHider.OnKeyBindUp += args => { if (args.Function != EngineKeyFunctions.Use) @@ -152,11 +161,13 @@ private void LoadIcons() ServerInfoHider.Texture = ServerInfoContent.Visible ? IconExpanded : IconCollapsed; CharacterInfoHider.Texture = CharacterInfoContent.Visible ? IconExpanded : IconCollapsed; ChatHider.Texture = ChatContent.Visible ? IconExpanded : IconCollapsed; + UserProfileHider.Texture = CharacterInfoContent.Visible ? IconExpanded : IconCollapsed; ServersHubHider.Modulate = StyleNano.NanoGold; ChangelogHider.Modulate = StyleNano.NanoGold; ServerInfoHider.Modulate = StyleNano.NanoGold; CharacterInfoHider.Modulate = StyleNano.NanoGold; ChatHider.Modulate = StyleNano.NanoGold; + UserProfileHider.Modulate = StyleNano.NanoGold; } private void OnServersHubEnableChanged(bool enable) diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml index d81856752ab..81eedce7d0b 100644 --- a/Content.Client/Options/UI/EscapeMenu.xaml +++ b/Content.Client/Options/UI/EscapeMenu.xaml @@ -11,6 +11,7 @@