foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-21 07:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

增加自由锚点支持，任意对齐方式

Browse Source
This commit is contained in:
monitor1394
2020-04-28 12:28:05 +08:00
parent 6288666000
commit 2a2725a196
27 changed files with 513 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/Component/Main/VisualMap.cs
View File

@@ -381,9 +381,9 @@ namespace XCharts
}
}
public float GetValue(Vector3 pos, float chartWidth, float chartHeight)
public float GetValue(Vector3 pos, Rect chartRect)
{
var centerPos = location.GetPosition(chartWidth, chartHeight);
var centerPos = new Vector3(chartRect.x, chartRect.y) + location.GetPosition(chartRect.width, chartRect.height);
var pos1 = centerPos + (runtimeIsVertical ? Vector3.down : Vector3.left) * itemHeight / 2;
var pos2 = centerPos + (runtimeIsVertical ? Vector3.up : Vector3.right) * itemHeight / 2;
if (runtimeIsVertical)
@@ -400,9 +400,9 @@ namespace XCharts
}
}
public bool IsInRect(Vector3 local, float chartWidth, float chartHeight, float triangleLen = 20)
public bool IsInRect(Vector3 local, Rect chartRect, float triangleLen = 20)
{
var centerPos = location.GetPosition(chartWidth, chartHeight);
var centerPos = new Vector3(chartRect.x, chartRect.y) + location.GetPosition(chartRect.width, chartRect.height);
var diff = calculable ? triangleLen : 0;
if (local.x >= centerPos.x - itemWidth / 2 - diff && local.x <= centerPos.x + itemWidth / 2 + diff &&
local.y >= centerPos.y - itemHeight / 2 - diff && local.y <= centerPos.y + itemHeight / 2 + diff)
@@ -415,9 +415,9 @@ namespace XCharts
}
}
public bool IsInRangeRect(Vector3 local, float chartWidth, float chartHeight)
public bool IsInRangeRect(Vector3 local, Rect chartRect)
{
var centerPos = location.GetPosition(chartWidth, chartHeight);
var centerPos = new Vector3(chartRect.x, chartRect.y) + location.GetPosition(chartRect.width, chartRect.height);
if (orient == Orient.Vertical)
{
var pos1 = centerPos + Vector3.down * itemHeight / 2;
@@ -432,9 +432,9 @@ namespace XCharts
}
}
public bool IsInRangeMinRect(Vector3 local, float chartWidth, float chartHeight, float triangleLen)
public bool IsInRangeMinRect(Vector3 local, Rect chartRect, float triangleLen)
{
var centerPos = location.GetPosition(chartWidth, chartHeight);
var centerPos = new Vector3(chartRect.x, chartRect.y) + location.GetPosition(chartRect.width, chartRect.height);
if (orient == Orient.Vertical)
{
var radius = triangleLen / 2;
@@ -454,9 +454,9 @@ namespace XCharts
}
}
public bool IsInRangeMaxRect(Vector3 local, float chartWidth, float chartHeight, float triangleLen)
public bool IsInRangeMaxRect(Vector3 local, Rect chartRect, float triangleLen)
{
var centerPos = location.GetPosition(chartWidth, chartHeight);
var centerPos = new Vector3(chartRect.x, chartRect.y) + location.GetPosition(chartRect.width, chartRect.height);
if (orient == Orient.Vertical)
{
var radius = triangleLen / 2;