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

Merge branch 'Tryibion-fix-carot-pos'

Browse Source
This commit is contained in:
Wojtek Figat
2024-09-24 09:26:41 +02:00
parent 5d578d9e92 bf56ccaee9
commit f817448839
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Engine/Render2D/Font.cpp
View File

@@ -402,7 +402,19 @@ Float2 Font::GetCharPosition(const StringView& text, int32 index, const TextLayo
{ {
// Check if there is no need to do anything // Check if there is no need to do anything
if (text.IsEmpty()) if (text.IsEmpty())
return layout.Bounds.Location; {
Float2 location = layout.Bounds.Location;
if (layout.VerticalAlignment == TextAlignment::Center)
location.Y += layout.Bounds.Size.Y * 0.5f - static_cast<float>(_height) * 0.5f;
else if (layout.VerticalAlignment == TextAlignment::Far)
location.Y += layout.Bounds.Size.Y - static_cast<float>(_height) * 0.5f;
if (layout.HorizontalAlignment == TextAlignment::Center)
location.X += layout.Bounds.Size.X * 0.5f;
else if (layout.HorizontalAlignment == TextAlignment::Far)
location.X += layout.Bounds.Size.X;
return location;
}
// Process text // Process text
Array<FontLineCache> lines; Array<FontLineCache> lines;

1
Source/Engine/UI/GUI/Common/TextBox.cs
View File

@@ -292,7 +292,6 @@ namespace FlaxEngine.GUI
float alpha = Mathf.Saturate(Mathf.Cos(_animateTime * CaretFlashSpeed) * 0.5f + 0.7f); float alpha = Mathf.Saturate(Mathf.Cos(_animateTime * CaretFlashSpeed) * 0.5f + 0.7f);
alpha = alpha * alpha * alpha * alpha * alpha * alpha; alpha = alpha * alpha * alpha * alpha * alpha * alpha;
Render2D.FillRectangle(CaretBounds, CaretColor * alpha); Render2D.FillRectangle(CaretBounds, CaretColor * alpha);
} }
// Restore rendering state // Restore rendering state