space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the options menu

Browse Source
This commit is contained in:
PsyKzz
2017-05-28 16:52:10 +01:00
parent 67d20bcf8a
commit 09fa7fd0ab
5 changed files with 190 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
SS14.Client.Graphics/Sprite/TextSprite.cs
View File

@@ -19,8 +19,21 @@ namespace SS14.Client.Graphics.Sprite
/// <summary>
/// Creates a TextSprite
/// </summary>
/// <param name=""> Label of TextSprite </param>
/// <param name="p2"> </param>
/// <param name="Label"> Label of TextSprite </param>
/// <param name="text"> Text to display </param>
/// <param name="font"> Font to use when displaying Text </param>
/// <param name="font"> Size of the font to use </param>
public TextSprite(string Label, string text, Font font, uint size)
{
this.Label = Label;
_textSprite = new Text(text, font, size);
}
/// <summary>
/// Creates a TextSprite
/// </summary>
/// <param name="Label"> Label of TextSprite </param>
/// <param name="text"> Text to display </param>
/// <param name="font"> Font to use when displaying Text </param>
public TextSprite(string Label, string text, Font font)
{
@@ -100,59 +113,33 @@ namespace SS14.Client.Graphics.Sprite
public bool Shadowed
{
get
{
return _shadowed;
}
set
{
this._shadowed = value;
}
get => _shadowed;
set => _shadowed = value;
}
public uint FontSize
{
get { return _textSprite.CharacterSize; }
set { _textSprite.CharacterSize = value; }
get => _textSprite.CharacterSize;
set => _textSprite.CharacterSize = value;
}
public Color ShadowColor
{
get
{
return _shadowColor;
}
set
{
this._shadowColor = value;
}
get => _shadowColor;
set => this._shadowColor = value;
}
public string Text
{
get
{
return _textSprite.DisplayedString;
}
set
{
_textSprite.DisplayedString = value;
}
get => _textSprite.DisplayedString;
set => _textSprite.DisplayedString = value;
}
public Vector2i Position;
public int Width
{
get { return (int)_textSprite.GetLocalBounds().Width; }
}
public int Height
{
// FIXME take into account newlines.
get { return (int)_textSprite.CharacterSize; }
}
public int Width => (int)_textSprite.GetLocalBounds().Width;
// FIXME take into account newlines.
public int Height => (int)_textSprite.CharacterSize;
#endregion Accessors
}
}

248
SS14.Client/State/States/OptionsMenu.cs
View File

@@ -8,7 +8,6 @@ using SS14.Client.UserInterface.Components;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using KeyEventArgs = SFML.Window.KeyEventArgs;
using Label = SS14.Client.UserInterface.Components.Label;
@@ -18,22 +17,25 @@ namespace SS14.Client.State.States
{
#region Fields
private readonly Label _btnApply;
private Sprite _background;
private Sprite _ticketBg;
private readonly Sprite _background;
private readonly Sprite _ticketBg;
private Checkbox _chkFullscreen;
private Checkbox _chkVsync;
private readonly Checkbox _chkFullscreen;
private readonly Checkbox _chkVsync;
private Label _lblTitle;
private Label _lblFullscreen;
private Label _lblVsync;
private Button _btnBack;
private Button _btnApply;
private readonly Label _lblFullscreen;
private readonly Label _lblVsync;
private readonly Label _btnMainMenu;
private readonly Listbox _lstResolution;
private Listbox _lstResolution;
private Dictionary<string, VideoMode> vmList = new Dictionary<string, VideoMode>();
private int _prevScreenHeight;
private int _prevScreenWidth;
private readonly Dictionary<string, VideoMode> vmList = new Dictionary<string, VideoMode>();
private IntRect _boundingArea = new IntRect();
#endregion
@@ -43,32 +45,107 @@ namespace SS14.Client.State.States
public OptionsMenu(IDictionary<Type, object> managers)
: base(managers)
{
UpdateBounds();
}
private void UpdateBounds()
{
_boundingArea.Height = 600;
_boundingArea.Width = 1000;
_boundingArea.Left = 0;
_boundingArea.Top = (int)(CluwneLib.Screen.Size.Y / 2f) - (int)(_boundingArea.Height / 2f);
}
private void InitalizeGUI()
{
_background = ResourceManager.GetSprite("mainbg");
_ticketBg = ResourceManager.GetSprite("ticketoverlay");
_lblTitle = new Label("Options", "CALIBRI", 48, ResourceManager);
UserInterfaceManager.AddComponent(_lblTitle);
_lblFullscreen = new Label("Fullscreen", "CALIBRI", ResourceManager);
UserInterfaceManager.AddComponent(_lblFullscreen);
_chkFullscreen = new Checkbox(ResourceManager);
_chkFullscreen.Value = ConfigurationManager.GetFullscreen();
_chkFullscreen.ValueChanged += _chkfullscreen_ValueChanged;
_chkfullscreen_ValueChanged(ConfigurationManager.GetFullscreen(), _chkFullscreen);
UserInterfaceManager.AddComponent(_chkFullscreen);
_lblVsync = new Label("Vsync", "CALIBRI", ResourceManager);
UserInterfaceManager.AddComponent(_lblVsync);
_chkVsync = new Checkbox(ResourceManager);
_chkVsync.Value = ConfigurationManager.GetVsync();
_chkVsync.ValueChanged += _chkvsync_ValueChanged;
_chkvsync_ValueChanged(ConfigurationManager.GetVsync(), _chkVsync);
UserInterfaceManager.AddComponent(_chkVsync);
_lstResolution = new Listbox(250, 150, ResourceManager);
_lstResolution.ItemSelected += _reslistbox_ItemSelected;
PopulateAvailableVideoModes();
UserInterfaceManager.AddComponent(_lstResolution);
IOrderedEnumerable<VideoMode> modes = from v in SFML.Window.VideoMode.FullscreenModes where
(v.Height > 748 && v.Width > 1024) //GOSH I HOPE NOONES USING 16 BIT COLORS. OR RUNNING AT LESS THAN 59 hz
orderby v.Height*v.Width ascending
select v;
_btnBack = new Button("Back", ResourceManager);
_btnBack.Clicked += _backBtn_Clicked;
UserInterfaceManager.AddComponent(_btnBack);
_btnApply = new Button("Apply Settings", ResourceManager);
_btnApply.Clicked += _applybtt_Clicked;
UserInterfaceManager.AddComponent(_btnApply);
UpdateGUIPosition();
}
private void UpdateGUIPosition()
{
var SECTION_PADDING = 50;
var OPTION_PADDING = 10;
var LABEL_PADDING = 3;
_lblTitle.Position = new Vector2i(_boundingArea.Left + 10, _boundingArea.Top + 10);
_lblTitle.Update(0);
_lstResolution.Position = new Vector2i(_boundingArea.Left + SECTION_PADDING,
_lblTitle.Position.Y + _lblTitle.ClientArea.Height + SECTION_PADDING);
_lstResolution.Update(0);
_chkFullscreen.Position = new Vector2i(_lstResolution.Position.X,
_lstResolution.Position.Y + _lstResolution.ClientArea.Height + SECTION_PADDING);
_chkFullscreen.Update(0);
_lblFullscreen.Position = new Vector2i(_chkFullscreen.Position.X + _chkFullscreen.ClientArea.Width + LABEL_PADDING,
_chkFullscreen.Position.Y);
_lblFullscreen.Update(0);
_chkVsync.Position = new Vector2i(_lblFullscreen.Position.X,
_lblFullscreen.Position.Y + _lblFullscreen.ClientArea.Height + OPTION_PADDING);
_chkVsync.Update(0);
_lblVsync.Position = new Vector2i(_chkVsync.Position.X + _chkVsync.ClientArea.Width + LABEL_PADDING,
_chkVsync.Position.Y);
_lblVsync.Update(0);
_btnApply.Position = new Vector2i((_boundingArea.Left + _boundingArea.Width) - (_btnApply.ClientArea.Width + SECTION_PADDING),
(_boundingArea.Top + _boundingArea.Height) - (_btnApply.ClientArea.Height + SECTION_PADDING));
_btnApply.Update(0);
_btnBack.Position = new Vector2i(_btnApply.Position.X - (_btnBack.ClientArea.Width + OPTION_PADDING), _btnApply.Position.Y);
_btnBack.Update(0);
UserInterfaceManager.Update(0);
}
private void PopulateAvailableVideoModes()
{
_lstResolution.ClearItems();
vmList.Clear();
IOrderedEnumerable<VideoMode> modes = from v in SFML.Window.VideoMode.FullscreenModes
where (v.Height > 748 && v.Width > 1024) //GOSH I HOPE NOONES USING 16 BIT COLORS. OR RUNNING AT LESS THAN 59 hz
orderby v.Height * v.Width ascending
select v;
if (!modes.Any())
//No compatible videomodes at all. It is likely the game is being run on a calculator. TODO handle this.
Application.Exit();
new Exception("No available video modes");
foreach (VideoMode vm in modes)
{
@@ -81,16 +158,16 @@ namespace SS14.Client.State.States
if (
vmList.Any(
x=>
x.Value.Width == CluwneLib.Screen.Size.X && x.Value.Height == CluwneLib.Screen.Size.Y ))
x =>
x.Value.Width == CluwneLib.Screen.Size.X && x.Value.Height == CluwneLib.Screen.Size.Y))
{
KeyValuePair<string, VideoMode> curr =
vmList.FirstOrDefault(
x =>
x.Value.Width == CluwneLib.Screen.Size.X &&
x.Value.Height == CluwneLib.Screen.Size.Y );
x.Value.Height == CluwneLib.Screen.Size.Y);
_lstResolution.SelectItem(curr.Key, false);
}
else
@@ -103,41 +180,38 @@ namespace SS14.Client.State.States
x.Value.Height == CluwneLib.Screen.Size.Y);
_lstResolution.SelectItem(curr.Key, false);
}
_ticketBg = ResourceManager.GetSprite("ticketoverlay");
_btnMainMenu = new Label("Main Menu", "CALIBRI", ResourceManager);
_btnMainMenu.DrawBorder = true;
_btnMainMenu.Clicked += _mainmenubtt_Clicked;
_btnApply = new Label("Apply", "CALIBRI", ResourceManager);
_btnApply.DrawBorder = true;
_btnApply.Clicked += _applybtt_Clicked;
_lstResolution.Position = new Vector2i(45 , (int)(CluwneLib.Screen.Size.Y / 2.5f));
_lstResolution.Update(0);
_chkFullscreen.Position = new Vector2i(_lstResolution.Position.X,
_lstResolution.Position.Y + _lstResolution.ClientArea.Height + 10);
_chkFullscreen.Update(0);
_chkVsync.Position = new Vector2i(_chkFullscreen.Position.X,
_chkFullscreen.Position.Y + _chkFullscreen.ClientArea.Height + 10);
_chkVsync.Update(0);
_lblFullscreen.Position = new Vector2i(_chkFullscreen.Position.X + _chkFullscreen.ClientArea.Width + 3,
_chkFullscreen.Position.Y + (int)(_chkFullscreen.ClientArea.Height / 2f) -
(int)(_lblFullscreen.ClientArea.Height / 2f));
_lblFullscreen.Update(0);
_lblVsync.Position = new Vector2i(_chkVsync.Position.X + _chkVsync.ClientArea.Width + 3,
_chkVsync.Position.Y + (int)(_chkVsync.ClientArea.Height / 2f) -
(int)(_chkVsync.ClientArea.Height / 2f));
_lblVsync.Update(0);
_btnMainMenu.Position = new Vector2i(_lstResolution.Position.X + 650, _lstResolution.Position.Y);
_btnMainMenu.Update(0);
_btnApply.Position = new Vector2i(_btnMainMenu.Position.X,
_btnMainMenu.Position.Y + _btnMainMenu.ClientArea.Height + 5);
_btnApply.Update(0);
}
#region Startup, Shutdown, Update
public void Startup()
{
NetworkManager.Disconnect(); //TODO: Is this really needed here?
InitalizeGUI();
}
public void Shutdown()
{
UserInterfaceManager.DisposeAllComponents();
}
public void Update(FrameEventArgs e)
{
if (CluwneLib.Screen.Size.X != _prevScreenWidth || CluwneLib.Screen.Size.Y != _prevScreenHeight)
{
_prevScreenHeight = (int)CluwneLib.Screen.Size.Y;
_prevScreenWidth = (int)CluwneLib.Screen.Size.X;
UpdateBounds();
UpdateGUIPosition();
}
_chkFullscreen.Value = ConfigurationManager.GetFullscreen();
UserInterfaceManager.Update(e.FrameDeltaTime);
}
#endregion
#region IState Members
public void Render(FrameEventArgs e)
@@ -145,8 +219,7 @@ namespace SS14.Client.State.States
_background.SetTransformToRect(new IntRect(0, 0, (int)CluwneLib.Screen.Size.X, (int) CluwneLib.Screen.Size.Y));
_background.Draw();
var bounds = _ticketBg.GetLocalBounds();
_ticketBg.SetTransformToRect(new IntRect(0, (int)(CluwneLib.Screen.Size.Y / 2f - bounds.Height / 2f), (int)bounds.Width, (int)bounds.Height));
_ticketBg.SetTransformToRect(_boundingArea);
_ticketBg.Draw();
UserInterfaceManager.Render();
}
@@ -216,10 +289,7 @@ namespace SS14.Client.State.States
ConfigurationManager.SetVsync(newValue);
}
private void _applybtt_Clicked(Label sender, MouseButtonEventArgs e)
{
ApplyVideoMode();
}
private void _chkfullscreen_ValueChanged(bool newValue, Checkbox sender)
{
@@ -243,59 +313,17 @@ namespace SS14.Client.State.States
private string GetVmString(VideoMode vm)
{
return vm.Width.ToString() + "x" + vm.Height.ToString() + " @ " + vm.BitsPerPixel+ " hz";
return string.Format(" - {0} x {1} @ {2}hz", vm.Width.ToString(), vm.Height.ToString(), vm.BitsPerPixel);
}
private void _exitbtt_Clicked(Label sender)
private void _applybtt_Clicked(Button sender)
{
Environment.Exit(0);
ApplyVideoMode();
}
private void _mainmenubtt_Clicked(Label sender, MouseButtonEventArgs e)
private void _backBtn_Clicked(Button sender)
{
StateManager.RequestStateChange<MainScreen>();
}
private void _connectbtt_Clicked(Label sender, MouseButtonEventArgs e)
{
}
private void _connecttxt_OnSubmit(string text)
{
}
#region Startup, Shutdown, Update
public void Startup()
{
NetworkManager.Disconnect();
UserInterfaceManager.AddComponent(_btnMainMenu);
UserInterfaceManager.AddComponent(_lstResolution);
UserInterfaceManager.AddComponent(_chkFullscreen);
UserInterfaceManager.AddComponent(_chkVsync);
UserInterfaceManager.AddComponent(_lblFullscreen);
UserInterfaceManager.AddComponent(_lblVsync);
UserInterfaceManager.AddComponent(_btnApply);
}
public void Shutdown()
{
UserInterfaceManager.RemoveComponent(_btnMainMenu);
UserInterfaceManager.RemoveComponent(_lstResolution);
UserInterfaceManager.RemoveComponent(_chkFullscreen);
UserInterfaceManager.RemoveComponent(_chkVsync);
UserInterfaceManager.RemoveComponent(_lblFullscreen);
UserInterfaceManager.RemoveComponent(_lblVsync);
UserInterfaceManager.RemoveComponent(_btnApply);
}
public void Update(FrameEventArgs e)
{
_chkFullscreen.Value = ConfigurationManager.GetFullscreen();
UserInterfaceManager.Update(e.FrameDeltaTime);
}
#endregion
}
}

3
SS14.Client/UserInterface/Components/Checkbox.cs
View File

@@ -27,6 +27,9 @@ namespace SS14.Client.UserInterface.Components
_resourceManager = resourceManager;
checkbox = _resourceManager.GetSprite("checkbox0");
checkboxCheck = _resourceManager.GetSprite("checkbox1");
ClientArea = new IntRect(Position,
new SFML.System.Vector2i((int)checkbox.GetLocalBounds().Width, (int)checkbox.GetLocalBounds().Height));
Update(0);
}

19
SS14.Client/UserInterface/Components/Label.cs
View File

@@ -26,19 +26,30 @@ namespace SS14.Client.UserInterface.Components
public TextSprite Text;
public Label(string text, string font, uint size, IResourceManager resourceManager)
{
_resourceManager = resourceManager;
Text = new TextSprite("Label" + text, text, _resourceManager.GetFont(font), size) { Color = Color.Black };
Update(0);
}
public Label(string text, string font, IResourceManager resourceManager)
{
_resourceManager = resourceManager;
Text = new TextSprite("Label" + text, text, _resourceManager.GetFont(font)) {Color = Color.Black};
Update(0);
}
public uint FontSize
{
get => Text.FontSize;
set => Text.FontSize = value;
}
public Color TextColor
{
get { return Text.Color; }
set { Text.Color = value;}
get => Text.Color;
set => Text.Color = value;
}
public bool DrawBorder { get; set; }

8
SS14.Client/UserInterface/Components/Listbox.cs
View File

@@ -68,6 +68,14 @@ namespace SS14.Client.UserInterface.Components
RebuildList();
}
/// <summary>
/// Removes all items from the listbox
/// </summary>
public void ClearItems() {
_contentStrings.Clear();
RebuildList();
}
public void RemoveItem(string str)
{
if (!_contentStrings.Contains(str)) return;