Update submodule, removal of window AddToScreen.

This commit is contained in:
Pieter-Jan Briers
2019-07-18 22:49:49 +02:00
parent a9a99c1821
commit ce1eab9181
16 changed files with 6 additions and 29 deletions

View File

@@ -49,10 +49,8 @@ namespace Content.Client.UserInterface
{
Visible = false
};
optionsMenu.AddToScreen();
Resizable = false;
HideOnClose = true;
Title = "Menu";
@@ -95,14 +93,12 @@ namespace Content.Client.UserInterface
private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
{
var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
window.AddToScreen();
window.OpenToLeft();
}
private void OnSpawnTilesButtonClicked(BaseButton.ButtonEventArgs args)
{
var window = new TileSpawnWindow(__tileDefinitionManager, _placementManager, _resourceCache);
window.AddToScreen();
window.OpenToLeft();
}

View File

@@ -113,14 +113,13 @@ namespace Content.Client.UserInterface
_buttonCraftingMenu.OnToggled += args => CraftingButtonToggled?.Invoke(args.Pressed);
_tutorialWindow = new TutorialWindow();
_tutorialWindow.AddToScreen();
_tutorialWindow.OnClose += () => _buttonTutorial.Pressed = false;
}
private void ButtonTutorialOnOnToggled(BaseButton.ButtonToggledEventArgs obj)
{
if (_tutorialWindow.Visible)
if (_tutorialWindow.IsOpen)
{
if (!_tutorialWindow.IsAtFront())
{

View File

@@ -29,9 +29,6 @@ You can ask on Discord or heck, just write it in OOC! We'll catch it.";
public TutorialWindow()
{
HideOnClose = true;
Visible = false;
var scrollContainer = new ScrollContainer();
Contents.AddChild(scrollContainer);