Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -12,8 +12,6 @@ namespace Barotrauma
public delegate bool OnSelectedHandler(GUITickBox obj);
public OnSelectedHandler OnSelected;
public static int size = 20;
private GUIRadioButtonGroup radioButtonGroup;
public override bool Selected
@@ -21,21 +19,7 @@ namespace Barotrauma
get { return isSelected; }
set
{
if (value == isSelected) { return; }
if (radioButtonGroup != null && radioButtonGroup.SelectedRadioButton == this)
{
isSelected = true;
return;
}
isSelected = value;
State = isSelected ? ComponentState.Selected : ComponentState.None;
if (value && radioButtonGroup != null)
{
radioButtonGroup.SelectRadioButton(this);
}
OnSelected?.Invoke(this);
SetSelected(value, callOnSelected: true);
}
}
@@ -186,6 +170,27 @@ namespace Barotrauma
text.SetTextPos();
ContentWidth = box.Rect.Width + text.Padding.X + text.TextSize.X + text.Padding.Z;
}
public void SetSelected(bool selected, bool callOnSelected = true)
{
if (selected == isSelected) { return; }
if (radioButtonGroup != null && radioButtonGroup.SelectedRadioButton == this)
{
isSelected = true;
return;
}
isSelected = selected;
State = isSelected ? ComponentState.Selected : ComponentState.None;
if (selected && radioButtonGroup != null)
{
radioButtonGroup.SelectRadioButton(this);
}
if (callOnSelected)
{
OnSelected?.Invoke(this);
}
}
protected override void Update(float deltaTime)
{