diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index 6d3d54e..4fc71e0 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -279,12 +279,21 @@ namespace WebWindowComplex.Models dimList.Add(new AreaDimension(item.dDimension, item.MeasureType, item.Parent)); if (nameDim.Equals("Width") && s.SashList.First().ElementDimensionList.Count > 0) { - double widthSash = dim + s.SashList.First().ElementDimensionList.Last().dOverlap - + s.SashList.Last().ElementDimensionList.ElementAt(1).dOverlap; + double widthSash = dim; + if (s.ParentArea.ParentArea is Split) + widthSash = dim + s.SashList.First().ElementDimensionList.Last().dOverlap + + s.SashList.Last().ElementDimensionList.ElementAt(1).dOverlap; double widthAnta = s.SashList.ElementAt(i).CalculateAbsoluteValue(dimList, widthSash); if(s.bIsDimensionLight || s.AreaList.ElementAt(i) is Split) widthAnta = widthAnta - s.SashList.ElementAt(i).ElementDimensionList.ElementAt(1).dDimension - s.SashList.ElementAt(i).ElementDimensionList.Last().dDimension; + else if(s.AreaList.ElementAt(i).AreaList != null || s.AreaList.ElementAt(i).AreaList.Count > 0) + { + if(s.AreaList.ElementAt(i).AreaList.FirstOrDefault() is Split) + widthAnta = widthAnta - s.SashList.ElementAt(i).ElementDimensionList.ElementAt(1).dDimension + - s.SashList.ElementAt(i).ElementDimensionList.Last().dDimension; + + } SearchAreaList(node.AreaList.ElementAt(i), widthAnta, nameDim); } else if(s.SashList.First().ElementDimensionList.Count > 0) @@ -400,7 +409,7 @@ namespace WebWindowComplex.Models + sash.SashList[i].ElementDimensionList.Last().dOverlap; } } - else if (sash.SashList.Count > 1 && dim > sum) + else if (sash.SashList.Count > 1) { for (int i = 1; i < sash.SashList.Count; i++) { diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 6a0823c..63ae3a0 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.217 + 3.1.3.218 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -258,6 +258,11 @@ + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 8391c50..d2b9906 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.217 + 3.1.3.218 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -209,6 +209,11 @@ + + + + +