Merge branch 'TooltipTextAlignment' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-TooltipTextAlignment

This commit is contained in:
Wojtek Figat
2024-10-22 23:35:24 +02:00
2 changed files with 21 additions and 2 deletions

View File

@@ -217,6 +217,15 @@ namespace FlaxEditor.Options
[EditorDisplay("Interface"), EditorOrder(320), Tooltip("Toggles tree line visibility in places like the Scene or Content Panel.")] [EditorDisplay("Interface"), EditorOrder(320), Tooltip("Toggles tree line visibility in places like the Scene or Content Panel.")]
public bool ShowTreeLines { get; set; } = true; public bool ShowTreeLines { get; set; } = true;
/// <summary>
/// Gets or sets tooltip text alignment.
/// </summary>
[DefaultValue(TextAlignment.Center)]
[EditorDisplay("Interface"), EditorOrder(321)]
public TextAlignment TooltipTextAlignment { get; set; } = TextAlignment.Center;
/// <summary> /// <summary>
/// Gets or sets the timestamps prefix mode for output log messages. /// Gets or sets the timestamps prefix mode for output log messages.
/// </summary> /// </summary>

View File

@@ -1,5 +1,7 @@
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved. // Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
using FlaxEditor;
using FlaxEditor.Options;
using System; using System;
namespace FlaxEngine.GUI namespace FlaxEngine.GUI
@@ -236,7 +238,15 @@ namespace FlaxEngine.GUI
// Padding for text // Padding for text
var textRect = GetClientArea(); var textRect = GetClientArea();
textRect.X += 5;
float textX = Editor.Instance.Options.Options.Interface.TooltipTextAlignment switch
{
TextAlignment.Near => 15,
TextAlignment.Center => 5,
TextAlignment.Far => -5,
};
textRect.X += textX;
textRect.Width -= 10; textRect.Width -= 10;
// Tooltip text // Tooltip text
@@ -245,7 +255,7 @@ namespace FlaxEngine.GUI
_currentText, _currentText,
textRect, textRect,
style.Foreground, style.Foreground,
TextAlignment.Center, Editor.Instance.Options.Options.Interface.TooltipTextAlignment,
TextAlignment.Center, TextAlignment.Center,
TextWrapping.WrapWords TextWrapping.WrapWords
); );