diff --git a/OpenRA.Game/FileFormats/VqaReader.cs b/OpenRA.Game/FileFormats/VqaReader.cs index baba6cd712..f8ca8a77ff 100644 --- a/OpenRA.Game/FileFormats/VqaReader.cs +++ b/OpenRA.Game/FileFormats/VqaReader.cs @@ -493,7 +493,7 @@ namespace OpenRA.FileFormats } } - public bool IsHqVqa { get { return (videoFlags & 0x10) == 16; } } + bool IsHqVqa { get { return (videoFlags & 0x10) == 16; } } void WriteBlock(int blockNumber, int count, ref int x, ref int y) { diff --git a/OpenRA.Game/Widgets/VqaPlayerWidget.cs b/OpenRA.Game/Widgets/VqaPlayerWidget.cs index b017fc1282..8831a9ddad 100644 --- a/OpenRA.Game/Widgets/VqaPlayerWidget.cs +++ b/OpenRA.Game/Widgets/VqaPlayerWidget.cs @@ -73,12 +73,12 @@ namespace OpenRA.Widgets video.Width, video.Height), TextureChannel.Alpha); - var videoDisplayHeight = video.IsHqVqa ? video.Height : video.Height * AspectRatio; - var scale = Math.Min((float)RenderBounds.Width / video.Width, (float)RenderBounds.Height / videoDisplayHeight); - videoOrigin = new float2(RenderBounds.X + (RenderBounds.Width - scale * video.Width) / 2, RenderBounds.Y + (RenderBounds.Height - scale * videoDisplayHeight) / 2); + + var scale = Math.Min((float)RenderBounds.Width / video.Width, (float)RenderBounds.Height / video.Height * AspectRatio); + videoOrigin = new float2(RenderBounds.X + (RenderBounds.Width - scale * video.Width) / 2, RenderBounds.Y + (RenderBounds.Height - scale * video.Height * AspectRatio) / 2); // Round size to integer pixels. Round up to be consistent with the scale calcuation. - videoSize = new float2((int)Math.Ceiling(video.Width * scale), (int)Math.Ceiling(videoDisplayHeight * scale)); + videoSize = new float2((int)Math.Ceiling(video.Width * scale), (int)Math.Ceiling(video.Height * AspectRatio * scale)); if (!DrawOverlay) return; diff --git a/mods/cnc/chrome/assetbrowser.yaml b/mods/cnc/chrome/assetbrowser.yaml index 5978575875..52532c8dd9 100644 --- a/mods/cnc/chrome/assetbrowser.yaml +++ b/mods/cnc/chrome/assetbrowser.yaml @@ -103,6 +103,7 @@ Container@ASSETBROWSER_PANEL: VqaPlayer@PLAYER: Width: PARENT_RIGHT Height: PARENT_BOTTOM + AspectRatio: 1 Container@FRAME_SELECTOR: X: 190 Y: 395 diff --git a/mods/ra/chrome/assetbrowser.yaml b/mods/ra/chrome/assetbrowser.yaml index a211ead23f..f206ff7c7b 100644 --- a/mods/ra/chrome/assetbrowser.yaml +++ b/mods/ra/chrome/assetbrowser.yaml @@ -98,6 +98,7 @@ Background@ASSETBROWSER_PANEL: VqaPlayer@PLAYER: Width: PARENT_RIGHT Height: PARENT_BOTTOM + AspectRatio: 1 Container@FRAME_SELECTOR: X: 190 Y: 425