Update submodule, removal of window AddToScreen.
This commit is contained in:
@@ -61,7 +61,6 @@ namespace Content.Client.Construction
|
|||||||
Placement = (PlacementManager)IoCManager.Resolve<IPlacementManager>();
|
Placement = (PlacementManager)IoCManager.Resolve<IPlacementManager>();
|
||||||
Placement.PlacementCanceled += OnPlacementCanceled;
|
Placement.PlacementCanceled += OnPlacementCanceled;
|
||||||
|
|
||||||
HideOnClose = true;
|
|
||||||
Title = "Construction";
|
Title = "Construction";
|
||||||
Visible = false;
|
Visible = false;
|
||||||
|
|
||||||
|
|||||||
@@ -50,8 +50,6 @@ namespace Content.Client
|
|||||||
|
|
||||||
_escapeMenu.OnClose += () => _gameHud.EscapeButtonDown = false;
|
_escapeMenu.OnClose += () => _gameHud.EscapeButtonDown = false;
|
||||||
|
|
||||||
_escapeMenu.AddToScreen();
|
|
||||||
|
|
||||||
var escapeMenuCommand = InputCmdHandler.FromDelegate(Enabled);
|
var escapeMenuCommand = InputCmdHandler.FromDelegate(Enabled);
|
||||||
|
|
||||||
_inputManager.SetInputCommand(EngineKeyFunctions.EscapeMenu, escapeMenuCommand);
|
_inputManager.SetInputCommand(EngineKeyFunctions.EscapeMenu, escapeMenuCommand);
|
||||||
@@ -68,7 +66,7 @@ namespace Content.Client
|
|||||||
|
|
||||||
private void Enabled(ICommonSession session)
|
private void Enabled(ICommonSession session)
|
||||||
{
|
{
|
||||||
if (_escapeMenu.Visible)
|
if (_escapeMenu.IsOpen)
|
||||||
{
|
{
|
||||||
if (_escapeMenu.IsAtFront())
|
if (_escapeMenu.IsAtFront())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -43,8 +43,6 @@ namespace Content.Client.GameObjects.Components.Actor
|
|||||||
var uiComponents = Owner.GetAllComponents<ICharacterUI>();
|
var uiComponents = Owner.GetAllComponents<ICharacterUI>();
|
||||||
Window = new CharacterWindow(uiComponents);
|
Window = new CharacterWindow(uiComponents);
|
||||||
Window.OnClose += () => _gameHud.CharacterButtonDown = false;
|
Window.OnClose += () => _gameHud.CharacterButtonDown = false;
|
||||||
|
|
||||||
Window.AddToScreen();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -98,7 +96,6 @@ namespace Content.Client.GameObjects.Components.Actor
|
|||||||
public CharacterWindow(IEnumerable<ICharacterUI> windowComponents)
|
public CharacterWindow(IEnumerable<ICharacterUI> windowComponents)
|
||||||
{
|
{
|
||||||
Title = "Character";
|
Title = "Character";
|
||||||
HideOnClose = true;
|
|
||||||
Visible = false;
|
Visible = false;
|
||||||
|
|
||||||
_contentsVBox = new VBoxContainer();
|
_contentsVBox = new VBoxContainer();
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ namespace Content.Client.GameObjects.Components.Construction
|
|||||||
ConstructionMenu = new ConstructionMenu {Owner = this};
|
ConstructionMenu = new ConstructionMenu {Owner = this};
|
||||||
ConstructionMenu.OnClose += () => _gameHud.CraftingButtonDown = false;
|
ConstructionMenu.OnClose += () => _gameHud.CraftingButtonDown = false;
|
||||||
}
|
}
|
||||||
ConstructionMenu.AddToScreen();
|
|
||||||
|
|
||||||
_gameHud.CraftingButtonVisible = true;
|
_gameHud.CraftingButtonVisible = true;
|
||||||
_gameHud.CraftingButtonToggled = b =>
|
_gameHud.CraftingButtonToggled = b =>
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ namespace Content.Client.GameObjects.Components.Power
|
|||||||
MarginRight = 426.0f, MarginBottom = 270.0f
|
MarginRight = 426.0f, MarginBottom = 270.0f
|
||||||
};
|
};
|
||||||
_window.OnClose += Close;
|
_window.OnClose += Close;
|
||||||
_window.AddToScreen();
|
|
||||||
|
|
||||||
_breakerButton = _window.BreakerButton;
|
_breakerButton = _window.BreakerButton;
|
||||||
_breakerButton.OnPressed += _ => SendMessage(new ApcToggleMainBreakerMessage());
|
_breakerButton.OnPressed += _ => SendMessage(new ApcToggleMainBreakerMessage());
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ namespace Content.Client.GameObjects.Components.Power
|
|||||||
Title = "Power Debug Tool",
|
Title = "Power Debug Tool",
|
||||||
};
|
};
|
||||||
LastWindow.Contents.AddChild(new Label() { Text = msg.Data });
|
LastWindow.Contents.AddChild(new Label() { Text = msg.Data });
|
||||||
LastWindow.AddToScreen();
|
|
||||||
LastWindow.Open();
|
LastWindow.Open();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,10 +52,8 @@ namespace Content.Client.GameObjects.Components.Research
|
|||||||
|
|
||||||
menu.OnClose += Close;
|
menu.OnClose += Close;
|
||||||
|
|
||||||
menu.AddToScreen();
|
|
||||||
menu.Populate();
|
menu.Populate();
|
||||||
menu.PopulateMaterials();
|
menu.PopulateMaterials();
|
||||||
queueMenu.AddToScreen();
|
|
||||||
|
|
||||||
menu.QueueButton.OnPressed += (args) => { queueMenu.OpenCentered(); };
|
menu.QueueButton.OnPressed += (args) => { queueMenu.OpenCentered(); };
|
||||||
|
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ namespace Content.Client.GameObjects.Components.Storage
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void OpenUI()
|
private void OpenUI()
|
||||||
{
|
{
|
||||||
Window.AddToScreen();
|
|
||||||
Window.Open();
|
Window.Open();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,7 +118,6 @@ namespace Content.Client.GameObjects.Components.Storage
|
|||||||
base.Initialize();
|
base.Initialize();
|
||||||
|
|
||||||
Title = "Storage Item";
|
Title = "Storage Item";
|
||||||
HideOnClose = true;
|
|
||||||
Visible = false;
|
Visible = false;
|
||||||
RectClipContent = true;
|
RectClipContent = true;
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace Content.Client.GameObjects.EntitySystems
|
|||||||
|
|
||||||
var menu = characterInterface.Window;
|
var menu = characterInterface.Window;
|
||||||
|
|
||||||
if (menu.Visible)
|
if (menu.IsOpen)
|
||||||
{
|
{
|
||||||
if (menu.IsAtFront())
|
if (menu.IsAtFront())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace Content.Client.GameObjects.EntitySystems
|
|||||||
|
|
||||||
var menu = constructor.ConstructionMenu;
|
var menu = constructor.ConstructionMenu;
|
||||||
|
|
||||||
if (menu.Visible)
|
if (menu.IsOpen)
|
||||||
{
|
{
|
||||||
if (menu.IsAtFront())
|
if (menu.IsAtFront())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ namespace Content.Client.Research
|
|||||||
base.Initialize();
|
base.Initialize();
|
||||||
IoCManager.InjectDependencies(this);
|
IoCManager.InjectDependencies(this);
|
||||||
|
|
||||||
HideOnClose = true;
|
|
||||||
Title = "Lathe Menu";
|
Title = "Lathe Menu";
|
||||||
Visible = false;
|
Visible = false;
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ namespace Content.Client.Research
|
|||||||
{
|
{
|
||||||
base.Initialize();
|
base.Initialize();
|
||||||
|
|
||||||
HideOnClose = true;
|
|
||||||
Title = "Lathe Queue";
|
Title = "Lathe Queue";
|
||||||
Visible = false;
|
Visible = false;
|
||||||
|
|
||||||
|
|||||||
@@ -49,10 +49,8 @@ namespace Content.Client.UserInterface
|
|||||||
{
|
{
|
||||||
Visible = false
|
Visible = false
|
||||||
};
|
};
|
||||||
optionsMenu.AddToScreen();
|
|
||||||
|
|
||||||
Resizable = false;
|
Resizable = false;
|
||||||
HideOnClose = true;
|
|
||||||
|
|
||||||
Title = "Menu";
|
Title = "Menu";
|
||||||
|
|
||||||
@@ -95,14 +93,12 @@ namespace Content.Client.UserInterface
|
|||||||
private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
|
private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
|
||||||
{
|
{
|
||||||
var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
|
var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
|
||||||
window.AddToScreen();
|
|
||||||
window.OpenToLeft();
|
window.OpenToLeft();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnSpawnTilesButtonClicked(BaseButton.ButtonEventArgs args)
|
private void OnSpawnTilesButtonClicked(BaseButton.ButtonEventArgs args)
|
||||||
{
|
{
|
||||||
var window = new TileSpawnWindow(__tileDefinitionManager, _placementManager, _resourceCache);
|
var window = new TileSpawnWindow(__tileDefinitionManager, _placementManager, _resourceCache);
|
||||||
window.AddToScreen();
|
|
||||||
window.OpenToLeft();
|
window.OpenToLeft();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -113,14 +113,13 @@ namespace Content.Client.UserInterface
|
|||||||
_buttonCraftingMenu.OnToggled += args => CraftingButtonToggled?.Invoke(args.Pressed);
|
_buttonCraftingMenu.OnToggled += args => CraftingButtonToggled?.Invoke(args.Pressed);
|
||||||
|
|
||||||
_tutorialWindow = new TutorialWindow();
|
_tutorialWindow = new TutorialWindow();
|
||||||
_tutorialWindow.AddToScreen();
|
|
||||||
|
|
||||||
_tutorialWindow.OnClose += () => _buttonTutorial.Pressed = false;
|
_tutorialWindow.OnClose += () => _buttonTutorial.Pressed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonTutorialOnOnToggled(BaseButton.ButtonToggledEventArgs obj)
|
private void ButtonTutorialOnOnToggled(BaseButton.ButtonToggledEventArgs obj)
|
||||||
{
|
{
|
||||||
if (_tutorialWindow.Visible)
|
if (_tutorialWindow.IsOpen)
|
||||||
{
|
{
|
||||||
if (!_tutorialWindow.IsAtFront())
|
if (!_tutorialWindow.IsAtFront())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,9 +29,6 @@ You can ask on Discord or heck, just write it in OOC! We'll catch it.";
|
|||||||
|
|
||||||
public TutorialWindow()
|
public TutorialWindow()
|
||||||
{
|
{
|
||||||
HideOnClose = true;
|
|
||||||
Visible = false;
|
|
||||||
|
|
||||||
var scrollContainer = new ScrollContainer();
|
var scrollContainer = new ScrollContainer();
|
||||||
Contents.AddChild(scrollContainer);
|
Contents.AddChild(scrollContainer);
|
||||||
|
|
||||||
|
|||||||
Submodule RobustToolbox updated: 31ca502418...8d2ea9aed1
Reference in New Issue
Block a user