Tooltip显示优化

This commit is contained in:
monitor1394
2019-06-03 23:15:23 +08:00
parent d23a7cb239
commit 949f6d02aa
4 changed files with 12 additions and 9 deletions

View File

@@ -6,6 +6,12 @@ using UnityEngine.EventSystems;
namespace XCharts
{
public enum Orient
{
Horizonal,
Vertical
}
public class BaseChart : MaskableGraphic
{
private static readonly string s_TitleObjectName = "title";
@@ -331,12 +337,14 @@ namespace XCharts
Input.mousePosition, null, out local))
{
m_Tooltip.SetActive(false);
RefreshChart();
return;
}
if (local.x < 0 || local.x > chartWidth ||
local.y < 0 || local.y > chartHeight)
{
m_Tooltip.SetActive(false);
RefreshChart();
return;
}
m_Tooltip.pointerPos = local;

View File

@@ -70,8 +70,8 @@ namespace XCharts
protected override void CheckTootipArea(Vector2 local)
{
if (local.x < zeroX || local.x > zeroX + coordinateWid ||
local.y < zeroY || local.y > zeroY + coordinateHig)
if (local.x < coordinateX || local.x > coordinateX + coordinateWid ||
local.y < coordinateY || local.y > coordinateY + coordinateHig)
{
m_Tooltip.dataIndex = 0;
RefreshTooltip();

View File

@@ -8,12 +8,6 @@ namespace XCharts
[System.Serializable]
public class Legend : JsonDataSupport, IPropertyChanged, IEquatable<Legend>
{
public enum Orient
{
Horizonal,
Vertical
}
[SerializeField] private bool m_Show = true;
[SerializeField] private Orient m_Orient = Orient.Horizonal;
[SerializeField] private Location m_Location = Location.defaultRight;

View File

@@ -119,7 +119,8 @@ namespace XCharts
public void SetActive(bool flag)
{
if(m_GameObject && m_GameObject.activeInHierarchy != flag)
lastDataIndex = 0;
if (m_GameObject && m_GameObject.activeInHierarchy != flag)
m_GameObject.SetActive(flag);
}