Correzioni

This commit is contained in:
Annamaria Sassi
2026-04-16 17:53:16 +02:00
parent 8f56f2e2a6
commit f2ad83fd09
6 changed files with 56 additions and 11 deletions
@@ -310,7 +310,7 @@ namespace WebWindowComplex.Compo
{
for (int k = 0; k < SashGroupList[j].AreaList.Count; k++)
{
if (SashGroupList[j].AreaList[k].AreaList[0].AreaList[0].Equals(CurrInglesina))
if (SashGroupList[j].AreaList[k].AreaList[0].AreaList.Count > 0 && SashGroupList[j].AreaList[k].AreaList[0].AreaList[0].Equals(CurrInglesina))
{
return "Sash group " + (j + 1) + " - sash " + (k + 1);
}
+8 -2
View File
@@ -233,7 +233,10 @@ namespace WebWindowComplex.Models
else
{
int deleteSubArea = ElemDimHorizList.Count + 1;
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
for (var SplitIndex = ElemDimHorizList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
}
if (nSplitQtyVert > 0)
ElemDimVertList.RemoveAll(x => x.nSubArea == deleteSubArea);
}
@@ -366,7 +369,10 @@ namespace WebWindowComplex.Models
if (bSplitStartVert)
{
int deleteSubArea = ElemDimVertList.Count + 1;
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
for(var SplitIndex = ElemDimVertList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
}
if (nSplitQtyHoriz > 0)
ElemDimHorizList.RemoveAll(x => x.nSubArea == deleteSubArea);
}
+7 -4
View File
@@ -271,7 +271,7 @@ namespace WebWindowComplex.Models
AreaList.Add(Splitted.CreateSplitted(this));
}
// Riaggiungo i sottoalberi che avevo salvato
for (int i = 0; i < AreaList.Count - 1; i++)
for (int i = 0; i <= ContentArea.Count - 1; i++)
{
if (AreaList.Count == 2)
{
@@ -280,9 +280,12 @@ namespace WebWindowComplex.Models
AreaList[i].AreaList.Add(ContentArea[i]);
}
// Aggiungo all'ultimo Splitted l'area di vetro
Fill newFill = Fill.CreateFill(AreaList[1], FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
AreaList[AreaList.Count - 1].AreaList.Add(newFill);
for(int k = ContentArea.Count; k <= AreaList.Count - 1; k++)
{
Fill newFill = Fill.CreateFill(AreaList[k], FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
AreaList[k].AreaList.Add(newFill);
}
}
// Se tolgo anta
else
+8 -2
View File
@@ -206,7 +206,10 @@ namespace WebWindowComplex.Models
else
{
int deleteSubArea = ElemDimHorizList.Count + 1;
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
for (var SplitIndex = ElemDimHorizList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
}
if(nSplitQtyVert > 0)
ElemDimVertList.RemoveAll(x => x.nSubArea == deleteSubArea);
}
@@ -371,7 +374,10 @@ namespace WebWindowComplex.Models
if (m_bSplitStartVert)
{
int deleteSubArea = ElemDimVertList.Count + 1;
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
for (var SplitIndex = ElemDimVertList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
}
if(nSplitQtyHoriz > 0)
ElemDimHorizList.RemoveAll(x=>x.nSubArea == deleteSubArea);
}
+16 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.4.1609</Version>
<Version>3.1.4.1617</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -137,6 +137,21 @@