diff --git a/Scripts/Editor/PropertyDrawers/TooltipDrawer.cs b/Scripts/Editor/PropertyDrawers/TooltipDrawer.cs
index 903a0d62..7bd90003 100644
--- a/Scripts/Editor/PropertyDrawers/TooltipDrawer.cs
+++ b/Scripts/Editor/PropertyDrawers/TooltipDrawer.cs
@@ -19,6 +19,8 @@ namespace XCharts
SerializedProperty m_FixedHeight = prop.FindPropertyRelative("m_FixedHeight");
SerializedProperty m_MinWidth = prop.FindPropertyRelative("m_MinWidth");
SerializedProperty m_MinHeight = prop.FindPropertyRelative("m_MinHeight");
+ SerializedProperty m_FontSize = prop.FindPropertyRelative("m_FontSize");
+ SerializedProperty m_FontStyle = prop.FindPropertyRelative("m_FontStyle");
ChartEditorHelper.MakeFoldout(ref drawRect, ref m_TooltipModuleToggle, "Tooltip", show);
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
@@ -36,13 +38,17 @@ namespace XCharts
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
EditorGUI.PropertyField(drawRect, m_MinHeight);
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+ EditorGUI.PropertyField(drawRect, m_FontSize);
+ drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+ EditorGUI.PropertyField(drawRect, m_FontStyle);
+ drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
}
}
public override float GetPropertyHeight(SerializedProperty prop, GUIContent label)
{
if (m_TooltipModuleToggle)
- return 7 * EditorGUIUtility.singleLineHeight + 6 * EditorGUIUtility.standardVerticalSpacing;
+ return 9 * EditorGUIUtility.singleLineHeight + 8 * EditorGUIUtility.standardVerticalSpacing;
else
return EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
}
diff --git a/Scripts/UI/Component/Tooltip.cs b/Scripts/UI/Component/Tooltip.cs
index 4c897405..9ef240c8 100644
--- a/Scripts/UI/Component/Tooltip.cs
+++ b/Scripts/UI/Component/Tooltip.cs
@@ -47,6 +47,8 @@ namespace XCharts
[SerializeField] private float m_FixedHeight = 0;
[SerializeField] private float m_MinWidth = 0;
[SerializeField] private float m_MinHeight = 0;
+ [SerializeField] private int m_FontSize = 18;
+ [SerializeField] private FontStyle m_FontStyle = FontStyle.Normal;
private GameObject m_GameObject;
private GameObject m_Content;
@@ -96,6 +98,16 @@ namespace XCharts
/// 最小高度。如若 fixedHeight 设有值,优先取 fixedHeight。
///
public float minHeight { get { return m_MinHeight; } set { m_MinHeight = value; } }
+ ///
+ /// font size.
+ /// 文字的字体大小。
+ ///
+ public int fontSize { get { return m_FontSize; } set { m_FontSize = value; } }
+ ///
+ /// font style.
+ /// 文字的字体风格。
+ ///
+ public FontStyle fontStyle { get { return m_FontStyle; } set { m_FontStyle = value; } }
///
/// The data index currently indicated by Tooltip.
diff --git a/Scripts/UI/Internal/BaseChart.cs b/Scripts/UI/Internal/BaseChart.cs
index d3046d44..26a38192 100644
--- a/Scripts/UI/Internal/BaseChart.cs
+++ b/Scripts/UI/Internal/BaseChart.cs
@@ -308,7 +308,8 @@ namespace XCharts
DestroyImmediate(tooltipObject.GetComponent());
var parent = tooltipObject.transform;
ChartHelper.HideAllObject(tooltipObject.transform);
- GameObject content = ChartHelper.AddTooltipContent("content", parent, m_ThemeInfo.font);
+ GameObject content = ChartHelper.AddTooltipContent("content", parent, m_ThemeInfo.font,
+ m_Tooltip.fontSize, m_Tooltip.fontStyle);
m_Tooltip.SetObj(tooltipObject);
m_Tooltip.SetContentObj(content);
m_Tooltip.SetContentBackgroundColor(m_ThemeInfo.tooltipBackgroundColor);
diff --git a/Scripts/UI/Utility/ChartHelper.cs b/Scripts/UI/Utility/ChartHelper.cs
index 4a57f2b0..82b9e0be 100644
--- a/Scripts/UI/Utility/ChartHelper.cs
+++ b/Scripts/UI/Utility/ChartHelper.cs
@@ -174,7 +174,7 @@ namespace XCharts
return btnObj.GetComponent