diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs index f7e7fa3d4d9e23..8b80a8a6af14db 100644 --- a/Content.Client/Flash/FlashOverlay.cs +++ b/Content.Client/Flash/FlashOverlay.cs @@ -22,7 +22,7 @@ public sealed class FlashOverlay : Overlay [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - public override OverlaySpace Space => OverlaySpace.ScreenSpace; + public override OverlaySpace Space => OverlaySpace.WorldSpace; private readonly ShaderInstance _shader; private double _startTime = -1; private double _lastsFor = 1; @@ -61,18 +61,16 @@ protected override void Draw(in OverlayDrawArgs args) if (percentComplete >= 1.0f) return; - var screenSpaceHandle = args.ScreenHandle; - screenSpaceHandle.UseShader(_shader); + var worldHandle = args.WorldHandle; + worldHandle.UseShader(_shader); _shader.SetParameter("percentComplete", percentComplete); - var screenSize = UIBox2.FromDimensions(new Vector2(0, 0), _displayManager.ScreenSize); - if (_screenshotTexture != null) { - screenSpaceHandle.DrawTextureRect(_screenshotTexture, screenSize); + worldHandle.DrawTextureRectRegion(_screenshotTexture, args.WorldBounds); } - screenSpaceHandle.UseShader(null); + worldHandle.UseShader(null); } protected override void DisposeBehavior() diff --git a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml index 528cbef31a7b4f..2da84e9eb1e92a 100644 --- a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml +++ b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml @@ -1,18 +1,26 @@ - - - - - - - - + + + + + + + + + + + + + + +