Clean up MouseFilterMode.Ignore from Controls
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Content.Client.Interfaces.Chat;
|
using Content.Client.Interfaces.Chat;
|
||||||
using Content.Shared.Chat;
|
using Content.Shared.Chat;
|
||||||
using Robust.Client.Console;
|
using Robust.Client.Console;
|
||||||
@@ -81,10 +81,7 @@ namespace Content.Client.Chat
|
|||||||
{
|
{
|
||||||
_netManager.RegisterNetMessage<MsgChatMessage>(MsgChatMessage.NAME, _onChatMessage);
|
_netManager.RegisterNetMessage<MsgChatMessage>(MsgChatMessage.NAME, _onChatMessage);
|
||||||
|
|
||||||
_speechBubbleRoot = new LayoutContainer
|
_speechBubbleRoot = new LayoutContainer();
|
||||||
{
|
|
||||||
MouseFilter = Control.MouseFilterMode.Ignore
|
|
||||||
};
|
|
||||||
LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide);
|
LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide);
|
||||||
_userInterfaceManager.StateRoot.AddChild(_speechBubbleRoot);
|
_userInterfaceManager.StateRoot.AddChild(_speechBubbleRoot);
|
||||||
_speechBubbleRoot.SetPositionFirst();
|
_speechBubbleRoot.SetPositionFirst();
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using Content.Client.Interfaces.Chat;
|
using Content.Client.Interfaces.Chat;
|
||||||
using Robust.Client.Interfaces.Graphics.ClientEye;
|
using Robust.Client.Interfaces.Graphics.ClientEye;
|
||||||
using Robust.Client.UserInterface;
|
using Robust.Client.UserInterface;
|
||||||
using Robust.Client.UserInterface.Controls;
|
using Robust.Client.UserInterface.Controls;
|
||||||
@@ -44,14 +44,12 @@ namespace Content.Client.Chat
|
|||||||
_senderEntity = senderEntity;
|
_senderEntity = senderEntity;
|
||||||
_eyeManager = eyeManager;
|
_eyeManager = eyeManager;
|
||||||
|
|
||||||
MouseFilter = MouseFilterMode.Ignore;
|
|
||||||
// Use text clipping so new messages don't overlap old ones being pushed up.
|
// Use text clipping so new messages don't overlap old ones being pushed up.
|
||||||
RectClipContent = true;
|
RectClipContent = true;
|
||||||
|
|
||||||
var label = new RichTextLabel
|
var label = new RichTextLabel
|
||||||
{
|
{
|
||||||
MaxWidth = 256,
|
MaxWidth = 256,
|
||||||
MouseFilter = MouseFilterMode.Ignore
|
|
||||||
};
|
};
|
||||||
label.SetMessage(text);
|
label.SetMessage(text);
|
||||||
|
|
||||||
@@ -59,7 +57,6 @@ namespace Content.Client.Chat
|
|||||||
{
|
{
|
||||||
StyleClasses = { "tooltipBox" },
|
StyleClasses = { "tooltipBox" },
|
||||||
Children = { label },
|
Children = { label },
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
ModulateSelfOverride = Color.White.WithAlpha(0.75f)
|
ModulateSelfOverride = Color.White.WithAlpha(0.75f)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -242,23 +242,22 @@ namespace Content.Client.GameObjects.Components.Storage
|
|||||||
};
|
};
|
||||||
AddChild(ActualButton);
|
AddChild(ActualButton);
|
||||||
|
|
||||||
var hBoxContainer = new HBoxContainer {MouseFilter = MouseFilterMode.Ignore};
|
var hBoxContainer = new HBoxContainer();
|
||||||
EntitySpriteView = new SpriteView
|
EntitySpriteView = new SpriteView
|
||||||
{
|
{
|
||||||
CustomMinimumSize = new Vector2(32.0f, 32.0f), MouseFilter = MouseFilterMode.Ignore
|
CustomMinimumSize = new Vector2(32.0f, 32.0f)
|
||||||
};
|
};
|
||||||
EntityName = new Label
|
EntityName = new Label
|
||||||
{
|
{
|
||||||
SizeFlagsVertical = SizeFlags.ShrinkCenter,
|
SizeFlagsVertical = SizeFlags.ShrinkCenter,
|
||||||
Text = "Backpack",
|
Text = "Backpack",
|
||||||
MouseFilter = MouseFilterMode.Ignore
|
|
||||||
};
|
};
|
||||||
hBoxContainer.AddChild(EntitySpriteView);
|
hBoxContainer.AddChild(EntitySpriteView);
|
||||||
hBoxContainer.AddChild(EntityName);
|
hBoxContainer.AddChild(EntityName);
|
||||||
|
|
||||||
EntityControl = new Control
|
EntityControl = new Control
|
||||||
{
|
{
|
||||||
SizeFlagsHorizontal = SizeFlags.FillExpand, MouseFilter = MouseFilterMode.Ignore
|
SizeFlagsHorizontal = SizeFlags.FillExpand
|
||||||
};
|
};
|
||||||
EntitySize = new Label
|
EntitySize = new Label
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -345,14 +345,12 @@ namespace Content.Client.UserInterface.Cargo
|
|||||||
|
|
||||||
var hBox = new HBoxContainer
|
var hBox = new HBoxContainer
|
||||||
{
|
{
|
||||||
SizeFlagsHorizontal = SizeFlags.FillExpand,
|
SizeFlagsHorizontal = SizeFlags.FillExpand
|
||||||
MouseFilter = MouseFilterMode.Ignore
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Icon = new TextureRect
|
Icon = new TextureRect
|
||||||
{
|
{
|
||||||
CustomMinimumSize = new Vector2(32.0f, 32.0f),
|
CustomMinimumSize = new Vector2(32.0f, 32.0f),
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
RectClipContent = true
|
RectClipContent = true
|
||||||
};
|
};
|
||||||
hBox.AddChild(Icon);
|
hBox.AddChild(Icon);
|
||||||
@@ -366,7 +364,6 @@ namespace Content.Client.UserInterface.Cargo
|
|||||||
var panel = new PanelContainer
|
var panel = new PanelContainer
|
||||||
{
|
{
|
||||||
PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 42) },
|
PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 42) },
|
||||||
MouseFilter = MouseFilterMode.Ignore
|
|
||||||
};
|
};
|
||||||
PointCost = new Label
|
PointCost = new Label
|
||||||
{
|
{
|
||||||
@@ -396,13 +393,11 @@ namespace Content.Client.UserInterface.Cargo
|
|||||||
var hBox = new HBoxContainer
|
var hBox = new HBoxContainer
|
||||||
{
|
{
|
||||||
SizeFlagsHorizontal = SizeFlags.FillExpand,
|
SizeFlagsHorizontal = SizeFlags.FillExpand,
|
||||||
MouseFilter = MouseFilterMode.Ignore
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Icon = new TextureRect
|
Icon = new TextureRect
|
||||||
{
|
{
|
||||||
CustomMinimumSize = new Vector2(32.0f, 32.0f),
|
CustomMinimumSize = new Vector2(32.0f, 32.0f),
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
RectClipContent = true
|
RectClipContent = true
|
||||||
};
|
};
|
||||||
hBox.AddChild(Icon);
|
hBox.AddChild(Icon);
|
||||||
|
|||||||
@@ -231,7 +231,6 @@ namespace Content.Client.UserInterface
|
|||||||
{
|
{
|
||||||
Sprite = _previewDummy.GetComponent<SpriteComponent>(),
|
Sprite = _previewDummy.GetComponent<SpriteComponent>(),
|
||||||
Scale = (2, 2),
|
Scale = (2, 2),
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
OverrideDirection = Direction.South
|
OverrideDirection = Direction.South
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -264,7 +263,6 @@ namespace Content.Client.UserInterface
|
|||||||
var internalHBox = new HBoxContainer
|
var internalHBox = new HBoxContainer
|
||||||
{
|
{
|
||||||
SizeFlagsHorizontal = SizeFlags.FillExpand,
|
SizeFlagsHorizontal = SizeFlags.FillExpand,
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
SeparationOverride = 0,
|
SeparationOverride = 0,
|
||||||
Children =
|
Children =
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ namespace Content.Client.UserInterface
|
|||||||
|
|
||||||
public void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
RootControl = new LayoutContainer {MouseFilter = Control.MouseFilterMode.Ignore};
|
RootControl = new LayoutContainer();
|
||||||
LayoutContainer.SetAnchorPreset(RootControl, LayoutContainer.LayoutPreset.Wide);
|
LayoutContainer.SetAnchorPreset(RootControl, LayoutContainer.LayoutPreset.Wide);
|
||||||
|
|
||||||
var escapeTexture = _resourceCache.GetTexture("/Textures/UserInterface/hamburger.svg.96dpi.png");
|
var escapeTexture = _resourceCache.GetTexture("/Textures/UserInterface/hamburger.svg.96dpi.png");
|
||||||
@@ -237,7 +237,6 @@ namespace Content.Client.UserInterface
|
|||||||
|
|
||||||
HandsContainer = new MarginContainer
|
HandsContainer = new MarginContainer
|
||||||
{
|
{
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
SizeFlagsVertical = Control.SizeFlags.ShrinkEnd
|
SizeFlagsVertical = Control.SizeFlags.ShrinkEnd
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -353,13 +352,11 @@ namespace Content.Client.UserInterface
|
|||||||
|
|
||||||
AddChild(new MarginContainer
|
AddChild(new MarginContainer
|
||||||
{
|
{
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
MarginTopOverride = 4,
|
MarginTopOverride = 4,
|
||||||
Children =
|
Children =
|
||||||
{
|
{
|
||||||
new VBoxContainer
|
new VBoxContainer
|
||||||
{
|
{
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
Children =
|
Children =
|
||||||
{
|
{
|
||||||
(_textureRect = new TextureRect
|
(_textureRect = new TextureRect
|
||||||
@@ -367,7 +364,6 @@ namespace Content.Client.UserInterface
|
|||||||
Texture = texture,
|
Texture = texture,
|
||||||
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
|
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
|
||||||
SizeFlagsVertical = SizeFlags.Expand | SizeFlags.ShrinkCenter,
|
SizeFlagsVertical = SizeFlags.Expand | SizeFlags.ShrinkCenter,
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
ModulateSelfOverride = ColorNormal,
|
ModulateSelfOverride = ColorNormal,
|
||||||
CustomMinimumSize = (0, 32),
|
CustomMinimumSize = (0, 32),
|
||||||
Stretch = TextureRect.StretchMode.KeepCentered
|
Stretch = TextureRect.StretchMode.KeepCentered
|
||||||
@@ -376,7 +372,6 @@ namespace Content.Client.UserInterface
|
|||||||
{
|
{
|
||||||
Text = keyName,
|
Text = keyName,
|
||||||
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
|
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
ModulateSelfOverride = ColorNormal,
|
ModulateSelfOverride = ColorNormal,
|
||||||
StyleClasses = {StyleClassLabelTopButton}
|
StyleClasses = {StyleClassLabelTopButton}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -39,8 +39,6 @@ namespace Content.Client.UserInterface
|
|||||||
{
|
{
|
||||||
IoCManager.InjectDependencies(this);
|
IoCManager.InjectDependencies(this);
|
||||||
|
|
||||||
MouseFilter = MouseFilterMode.Ignore;
|
|
||||||
|
|
||||||
var textureHandLeft = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_l.png");
|
var textureHandLeft = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_l.png");
|
||||||
var textureHandRight = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_r.png");
|
var textureHandRight = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_r.png");
|
||||||
var textureHandActive = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_active.png");
|
var textureHandActive = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_active.png");
|
||||||
@@ -54,8 +52,7 @@ namespace Content.Client.UserInterface
|
|||||||
var hBox = new HBoxContainer
|
var hBox = new HBoxContainer
|
||||||
{
|
{
|
||||||
SeparationOverride = 0,
|
SeparationOverride = 0,
|
||||||
Children = {_rightStatusPanel, _rightButton, _leftButton, _leftStatusPanel},
|
Children = {_rightStatusPanel, _rightButton, _leftButton, _leftStatusPanel}
|
||||||
MouseFilter = MouseFilterMode.Ignore
|
|
||||||
};
|
};
|
||||||
|
|
||||||
AddChild(hBox);
|
AddChild(hBox);
|
||||||
@@ -68,7 +65,6 @@ namespace Content.Client.UserInterface
|
|||||||
// Active hand
|
// Active hand
|
||||||
_leftButton.AddChild(ActiveHandRect = new TextureRect
|
_leftButton.AddChild(ActiveHandRect = new TextureRect
|
||||||
{
|
{
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
Texture = textureHandActive,
|
Texture = textureHandActive,
|
||||||
TextureScale = (2, 2)
|
TextureScale = (2, 2)
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ namespace Content.Client.GameObjects
|
|||||||
|
|
||||||
AddChild(SpriteView = new SpriteView
|
AddChild(SpriteView = new SpriteView
|
||||||
{
|
{
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
Scale = (2, 2),
|
Scale = (2, 2),
|
||||||
OverrideDirection = Direction.South
|
OverrideDirection = Direction.South
|
||||||
});
|
});
|
||||||
@@ -52,7 +51,6 @@ namespace Content.Client.GameObjects
|
|||||||
{
|
{
|
||||||
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
|
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
|
||||||
SizeFlagsVertical = SizeFlags.ShrinkCenter,
|
SizeFlagsVertical = SizeFlags.ShrinkCenter,
|
||||||
MouseFilter = MouseFilterMode.Ignore,
|
|
||||||
Stretch = TextureRect.StretchMode.KeepCentered,
|
Stretch = TextureRect.StretchMode.KeepCentered,
|
||||||
TextureScale = (2, 2),
|
TextureScale = (2, 2),
|
||||||
Visible = false,
|
Visible = false,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using Robust.Client.UserInterface;
|
using Robust.Client.UserInterface;
|
||||||
using Robust.Client.UserInterface.Controls;
|
using Robust.Client.UserInterface.Controls;
|
||||||
|
|
||||||
namespace Content.Client.UserInterface
|
namespace Content.Client.UserInterface
|
||||||
@@ -14,7 +14,6 @@ namespace Content.Client.UserInterface
|
|||||||
public StatusEffectsUI()
|
public StatusEffectsUI()
|
||||||
{
|
{
|
||||||
_vBox = new VBoxContainer();
|
_vBox = new VBoxContainer();
|
||||||
MouseFilter = Control.MouseFilterMode.Ignore;
|
|
||||||
AddChild(_vBox);
|
AddChild(_vBox);
|
||||||
|
|
||||||
LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin);
|
LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin);
|
||||||
|
|||||||
Reference in New Issue
Block a user