GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix rich textbox vertical alignment

Browse Source 
#3502
This commit is contained in:
Wojtek Figat
2025-09-15 15:17:18 +02:00
parent e2a4c8ab03
commit ae4ae7a638
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Engine/UI/GUI/Common/RichTextBox.Parsing.cs
View File

@@ -240,11 +240,13 @@ namespace FlaxEngine.GUI
// Organize text blocks within line // Organize text blocks within line
var horizontalAlignments = TextBlockStyle.Alignments.Baseline; var horizontalAlignments = TextBlockStyle.Alignments.Baseline;
var verticalAlignments = TextBlockStyle.Alignments.Baseline;
for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++)
{ {
ref TextBlock textBlock = ref textBlocks[i]; ref TextBlock textBlock = ref textBlocks[i];
var vOffset = lineSize.Y - textBlock.Bounds.Height; var vOffset = lineSize.Y - textBlock.Bounds.Height;
horizontalAlignments |= textBlock.Style.Alignment & TextBlockStyle.Alignments.HorizontalMask; horizontalAlignments |= textBlock.Style.Alignment & TextBlockStyle.Alignments.HorizontalMask;
verticalAlignments |= textBlock.Style.Alignment & TextBlockStyle.Alignments.VerticalMask;
switch (textBlock.Style.Alignment & TextBlockStyle.Alignments.VerticalMask) switch (textBlock.Style.Alignment & TextBlockStyle.Alignments.VerticalMask)
{ {
case TextBlockStyle.Alignments.Baseline: case TextBlockStyle.Alignments.Baseline:
@@ -272,14 +274,16 @@ namespace FlaxEngine.GUI
} }
} }
} }
var hOffset = Width - lineSize.X;
// Organize blocks within whole container
var sizeOffset = Size - lineSize;
if ((horizontalAlignments & TextBlockStyle.Alignments.Center) == TextBlockStyle.Alignments.Center) if ((horizontalAlignments & TextBlockStyle.Alignments.Center) == TextBlockStyle.Alignments.Center)
{ {
hOffset *= 0.5f; sizeOffset.X *= 0.5f;
for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++)
{ {
ref TextBlock textBlock = ref textBlocks[i]; ref TextBlock textBlock = ref textBlocks[i];
textBlock.Bounds.Location.X += hOffset; textBlock.Bounds.Location.X += sizeOffset.X;
} }
} }
else if ((horizontalAlignments & TextBlockStyle.Alignments.Right) == TextBlockStyle.Alignments.Right) else if ((horizontalAlignments & TextBlockStyle.Alignments.Right) == TextBlockStyle.Alignments.Right)
@@ -287,7 +291,24 @@ namespace FlaxEngine.GUI
for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++)
{ {
ref TextBlock textBlock = ref textBlocks[i]; ref TextBlock textBlock = ref textBlocks[i];
textBlock.Bounds.Location.X += hOffset; textBlock.Bounds.Location.X += sizeOffset.X;
}
}
if ((verticalAlignments & TextBlockStyle.Alignments.Middle) == TextBlockStyle.Alignments.Middle)
{
sizeOffset.Y *= 0.5f;
for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++)
{
ref TextBlock textBlock = ref textBlocks[i];
textBlock.Bounds.Location.Y += sizeOffset.Y;
}
}
else if ((verticalAlignments & TextBlockStyle.Alignments.Bottom) == TextBlockStyle.Alignments.Bottom)
{
for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++)
{
ref TextBlock textBlock = ref textBlocks[i];
textBlock.Bounds.Location.Y += sizeOffset.Y;
} }
} }

3
Source/Engine/UI/GUI/TextBlockStyle.cs
View File

@@ -1,5 +1,7 @@
// Copyright (c) Wojciech Figat. All rights reserved. // Copyright (c) Wojciech Figat. All rights reserved.
using System;
namespace FlaxEngine.GUI namespace FlaxEngine.GUI
{ {
/// <summary> /// <summary>
@@ -10,6 +12,7 @@ namespace FlaxEngine.GUI
/// <summary> /// <summary>
/// Text block alignments modes. /// Text block alignments modes.
/// </summary> /// </summary>
[Flags]
public enum Alignments public enum Alignments
{ {
/// <summary> /// <summary>