修复图例判断超范围异常的问题

This commit is contained in:
monitor1394
2020-06-07 18:22:57 +08:00
parent 9e16e72c51
commit 71317e52b1
2 changed files with 79 additions and 70 deletions

View File

@@ -92,7 +92,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
@@ -105,7 +105,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
@@ -118,7 +118,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX -= legendRuntimeWidth + legend.itemGap;
@@ -134,7 +134,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
@@ -148,7 +148,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
@@ -163,7 +163,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX -= legendRuntimeWidth + legend.itemGap;
@@ -178,7 +178,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
@@ -193,7 +193,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
@@ -208,7 +208,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currHeight + item.height + legend.itemGap > legendHeight)
if (currHeight + item.height > legendHeight)
{
currHeight = 0;
offsetX -= legendRuntimeWidth + legend.itemGap;
@@ -229,7 +229,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currWidth + item.width + legend.itemGap >= legendWidth)
if (currWidth + item.width > legendWidth)
{
currWidth = 0f;
if (isBottom) currHeight += legend.itemGap + item.height;
@@ -247,7 +247,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currWidth + item.width + legend.itemGap >= legendWidth)
if (currWidth + item.width > legendWidth)
{
currWidth = 0f;
if (isBottom) currHeight += legend.itemGap + item.height;
@@ -265,7 +265,7 @@ namespace XCharts
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
if (currWidth + item.width + legend.itemGap >= legendWidth)
if (currWidth + item.width > legendWidth)
{
currWidth = 0f;
if (isBottom) currHeight += legend.itemGap + item.height;