Swap the positions of AHelp and Rules in the main interface (#7957)

suggested by Kaylie
This commit is contained in:
20kdc
2022-05-06 04:46:33 +01:00
committed by GitHub
parent d332c829e8
commit 330fb13b25
7 changed files with 26 additions and 62 deletions

View File

@@ -49,8 +49,7 @@ public interface IButtonBarView
event Action<bool> SandboxButtonToggled;
// Info top button
bool InfoButtonDown { get; set; }
event Action<bool> InfoButtonToggled;
event Action InfoButtonPressed;
}
internal sealed partial class GameHud
@@ -196,32 +195,18 @@ internal sealed partial class GameHud
{
ToolTip = Loc.GetString("ui-options-function-open-info"),
MinSize = topMinSize,
StyleClasses = { StyleBase.ButtonOpenLeft, TopButton.StyleClassRedTopButton },
StyleClasses = { StyleBase.ButtonOpenLeft },
ToggleMode = false
};
topButtonsContainer.AddChild(_buttonInfo);
_buttonInfo.OnToggled += args => InfoButtonToggled?.Invoke(args.Pressed);
_buttonInfo.OnToggled += ButtonInfoToggledHandler;
_buttonInfo.OnPressed += args => InfoButtonPressed?.Invoke();
}
return topButtonsContainer;
}
private void ButtonInfoToggledHandler(BaseButton.ButtonToggledEventArgs obj)
{
ButtonInfoToggled(obj.Pressed);
}
private void ButtonInfoToggled(bool pressed)
{
if(!pressed)
return;
_buttonInfo.StyleClasses.Remove(TopButton.StyleClassRedTopButton);
_buttonInfo.OnToggled -= ButtonInfoToggledHandler;
}
/// <inheritdoc />
public bool EscapeButtonDown
{
@@ -335,16 +320,5 @@ internal sealed partial class GameHud
public event Action<bool>? SandboxButtonToggled;
/// <inheritdoc />
public bool InfoButtonDown
{
get => _buttonInfo.Pressed;
set
{
_buttonInfo.Pressed = value;
ButtonInfoToggled(value);
}
}
/// <inheritdoc />
public event Action<bool>? InfoButtonToggled;
public event Action? InfoButtonPressed;
}