From 930fb59755fd33dc820ddb18e9855595e7be1eeb Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 4 Jun 2020 07:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96`Legend`=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=97=B6=E8=87=AA=E5=8A=A8=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/CHANGELOG.md | 1 + Assets/XCharts/Runtime/Internal/BaseChart.cs | 2 +- .../Runtime/Internal/Helper/LegendHelper.cs | 156 +++++++++++++----- 3 files changed, 119 insertions(+), 40 deletions(-) diff --git a/Assets/XCharts/CHANGELOG.md b/Assets/XCharts/CHANGELOG.md index ee18dade..209e6368 100644 --- a/Assets/XCharts/CHANGELOG.md +++ b/Assets/XCharts/CHANGELOG.md @@ -1,6 +1,7 @@ # 更新日志 +* (2020.06.04) 优化`Legend`数量过多时自动换行显示 * (2020.06.03) 发布`v1.5.1`版本 * (2020.06.02) 增加`Radar`的`ceilRate`，设置最大最小值的取整倍率 * (2020.06.02) 优化`Tooltip`的`formatter`，支持`{c1:1-1:f1}`格式配置 diff --git a/Assets/XCharts/Runtime/Internal/BaseChart.cs b/Assets/XCharts/Runtime/Internal/BaseChart.cs index ae9b1048..3af9e4c8 100644 --- a/Assets/XCharts/Runtime/Internal/BaseChart.cs +++ b/Assets/XCharts/Runtime/Internal/BaseChart.cs @@ -450,7 +450,7 @@ namespace XCharts OnLegendButtonClick(n, m_LegendRealShowName[n], n == 0 ? true : false); } } - LegendHelper.ResetItemPosition(m_Legend); + LegendHelper.ResetItemPosition(m_Legend, m_ChartWidth, m_ChartHeight); } private void InitSerieLabel() diff --git a/Assets/XCharts/Runtime/Internal/Helper/LegendHelper.cs b/Assets/XCharts/Runtime/Internal/Helper/LegendHelper.cs index 3a9d9b3c..88978548 100644 --- a/Assets/XCharts/Runtime/Internal/Helper/LegendHelper.cs +++ b/Assets/XCharts/Runtime/Internal/Helper/LegendHelper.cs @@ -71,102 +71,150 @@ namespace XCharts return item; } - public static void ResetItemPosition(Legend legend) + public static void ResetItemPosition(Legend legend, float chartWidth, float chartHeight) { var startX = 0f; + var startY = 0f; + var offsetX = 0f; var currWidth = 0f; var currHeight = 0f; - + var legendWidth = chartWidth - legend.location.left - legend.location.right; + var legendHeight = chartHeight - legend.location.top - legend.location.bottom; + var legendRuntimeWidth = legend.runtimeWidth; + var legendRuntimeHeight = legend.runtimeHeight; switch (legend.orient) { case Orient.Vertical: switch (legend.location.align) { case Location.Align.TopCenter: - startX = legend.runtimeWidth / 2; - currHeight = 0f; + startX = legendRuntimeWidth / 2; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(-startX + item.width / 2, -currHeight)); + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX += legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(-startX + item.width / 2 + offsetX, -currHeight)); currHeight += item.height + legend.itemGap; } break; case Location.Align.TopLeft: - currHeight = 0f; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(0, -currHeight)); + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX += legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(0 + offsetX, -currHeight)); currHeight += item.height + legend.itemGap; } break; - case Location.Align.TopRight: - currHeight = 0f; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(item.width - legend.runtimeWidth, -currHeight)); + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX -= legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(item.width - legendRuntimeWidth + offsetX, -currHeight)); currHeight += item.height + legend.itemGap; } break; case Location.Align.Center: - startX = legend.runtimeWidth / 2; - currHeight = legend.runtimeHeight; + startX = legendRuntimeWidth / 2; + startY = legendRuntimeHeight > legendHeight ? legendHeight / 2 : legendRuntimeHeight / 2; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(-startX + item.width / 2, currHeight - item.height)); - currHeight -= item.height + legend.itemGap; + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX += legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(-startX + item.width / 2 + offsetX, startY - currHeight)); + currHeight += item.height + legend.itemGap; } break; case Location.Align.CenterLeft: - currHeight = legend.runtimeHeight; + startY = legendRuntimeHeight > legendHeight ? legendHeight / 2 : legendRuntimeHeight / 2; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(0, currHeight - item.height)); - currHeight -= item.height + legend.itemGap; + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX += legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(offsetX, startY - currHeight - item.height)); + currHeight += item.height + legend.itemGap; } break; case Location.Align.CenterRight: - currHeight = legend.runtimeHeight; + startX = 0; + startY = legendRuntimeHeight > legendHeight ? legendHeight / 2 : legendRuntimeHeight / 2; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(item.width - legend.runtimeWidth, currHeight - item.height)); - currHeight -= item.height + legend.itemGap; + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX -= legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(item.width - legendRuntimeWidth + offsetX, startY - currHeight - item.height)); + currHeight += item.height + legend.itemGap; } break; case Location.Align.BottomCenter: - startX = legend.runtimeWidth / 2; - currHeight = legend.runtimeHeight; + startX = legendRuntimeWidth / 2; + startY = legendRuntimeHeight > legendHeight ? legendHeight : legendRuntimeHeight; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(-startX + item.width / 2, currHeight - item.height)); - currHeight -= item.height + legend.itemGap; + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX += legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(-startX + item.width / 2 + offsetX, startY - currHeight - item.height)); + currHeight += item.height + legend.itemGap; } break; - case Location.Align.BottomLeft: - currHeight = legend.runtimeHeight; + startX = 0; + startY = legendRuntimeHeight > legendHeight ? legendHeight : legendRuntimeHeight; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(0, currHeight - item.height)); - currHeight -= item.height + legend.itemGap; + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX += legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(startX + offsetX, startY - currHeight - item.height)); + currHeight += item.height + legend.itemGap; } break; case Location.Align.BottomRight: - currHeight = legend.runtimeHeight; + startX = 0; + startY = legendRuntimeHeight > legendHeight ? legendHeight : legendRuntimeHeight; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(item.width - legend.runtimeWidth, currHeight - item.height)); - currHeight -= item.height + legend.itemGap; + if (currHeight + item.height + legend.itemGap > legendHeight) + { + currHeight = 0; + offsetX -= legendRuntimeWidth + legend.itemGap; + } + item.SetPosition(new Vector3(item.width - legendRuntimeWidth + offsetX, startY - currHeight - item.height)); + currHeight += item.height + legend.itemGap; } break; } @@ -177,35 +225,53 @@ namespace XCharts case Location.Align.TopLeft: case Location.Align.CenterLeft: case Location.Align.BottomLeft: - currWidth = 0f; + var isBottom = legend.location.align == Location.Align.BottomLeft; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(currWidth, 0)); + if (currWidth + item.width + legend.itemGap >= legendWidth) + { + currWidth = 0f; + if (isBottom) currHeight += legend.itemGap + item.height; + else currHeight -= legend.itemGap + item.height; + } + item.SetPosition(new Vector3(currWidth, currHeight)); currWidth += item.width + legend.itemGap; } break; case Location.Align.TopCenter: case Location.Align.Center: case Location.Align.BottomCenter: - startX = legend.runtimeWidth / 2; - currWidth = 0f; + isBottom = legend.location.align == Location.Align.BottomCenter; + startX = legendRuntimeWidth > legendWidth ? legendWidth / 2 : legendRuntimeWidth / 2; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(-startX + item.width / 2 + currWidth, 0)); + if (currWidth + item.width + legend.itemGap >= legendWidth) + { + currWidth = 0f; + if (isBottom) currHeight += legend.itemGap + item.height; + else currHeight -= legend.itemGap + item.height; + } + item.SetPosition(new Vector3(-startX + item.width / 2 + currWidth, currHeight)); currWidth += item.width + legend.itemGap; } break; case Location.Align.TopRight: case Location.Align.CenterRight: case Location.Align.BottomRight: - startX = -legend.runtimeWidth; - currWidth = 0f; + isBottom = legend.location.align == Location.Align.BottomRight; + startX = legendRuntimeWidth > legendWidth ? -legendWidth : -legendRuntimeWidth; foreach (var kv in legend.buttonList) { var item = kv.Value; - item.SetPosition(new Vector3(startX + currWidth + item.width, 0)); + if (currWidth + item.width + legend.itemGap >= legendWidth) + { + currWidth = 0f; + if (isBottom) currHeight += legend.itemGap + item.height; + else currHeight -= legend.itemGap + item.height; + } + item.SetPosition(new Vector3(startX + currWidth + item.width, currHeight)); currWidth += item.width + legend.itemGap; } break; @@ -214,6 +280,18 @@ namespace XCharts } } + private static bool IsBeyondWidth(Legend legend, float maxWidth) + { + var totalWidth = 0f; + foreach (var kv in legend.buttonList) + { + var item = kv.Value; + totalWidth += item.width + legend.itemGap; + if (totalWidth > maxWidth) return true; + } + return false; + } + public static bool CheckDataShow(Series series, string legendName, bool show) { bool needShow = false;