Modificato aggiornamento dimensioni sottoaree
This commit is contained in:
@@ -205,22 +205,7 @@ namespace WebWindowComplex.Models
|
||||
}
|
||||
}
|
||||
}
|
||||
if (SplitHorizList.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < AreaList.Count; i++)
|
||||
{
|
||||
if (i < SplitHorizList.Count)
|
||||
AreaList.ElementAt(i).SearchAreaList(AreaList.ElementAt(i), SplitHorizList.ElementAt(i).dDimension, "Width");
|
||||
}
|
||||
}
|
||||
if (SplitVertList.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < AreaList.Count; i++)
|
||||
{
|
||||
if (i < SplitVertList.Count)
|
||||
AreaList.ElementAt(i).SearchAreaList(AreaList.ElementAt(i), SplitVertList.ElementAt(i).dDimension, "Height");
|
||||
}
|
||||
}
|
||||
//UpdateSubAreaSplit();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -371,22 +356,7 @@ namespace WebWindowComplex.Models
|
||||
}
|
||||
}
|
||||
}
|
||||
if(SplitHorizList.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < AreaList.Count; i++)
|
||||
{
|
||||
if(i < SplitHorizList.Count)
|
||||
AreaList.ElementAt(i).SearchAreaList(AreaList.ElementAt(i), SplitHorizList.ElementAt(i).dDimension, "Width");
|
||||
}
|
||||
}
|
||||
if (SplitVertList.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < AreaList.Count; i++)
|
||||
{
|
||||
if(i < SplitVertList.Count)
|
||||
AreaList.ElementAt(i).SearchAreaList(AreaList.ElementAt(i), SplitVertList.ElementAt(i).dDimension, "Height");
|
||||
}
|
||||
}
|
||||
//UpdateSubAreaSplit();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -438,6 +408,7 @@ namespace WebWindowComplex.Models
|
||||
AreaList[SplitIndex].AreaList.Add(newFill);
|
||||
}
|
||||
}
|
||||
//UpdateSubAreaSplit();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -762,6 +733,56 @@ namespace WebWindowComplex.Models
|
||||
return dim;
|
||||
}
|
||||
|
||||
internal void UpdateSubAreaSplit()
|
||||
{
|
||||
if (SplitHorizList.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < AreaList.Count; i++)
|
||||
{
|
||||
if (i < SplitHorizList.Count)
|
||||
{
|
||||
SplitDimension currSplitDim = SplitHorizList[i];
|
||||
List<AreaDimension> dimList = new List<AreaDimension>();
|
||||
foreach (var itemDim in SplitHorizList)
|
||||
dimList.Add(new AreaDimension(itemDim.dDimension, itemDim.MeasureType, itemDim.Parent));
|
||||
double width = ParentArea.CalculateWidthArea(ParentArea.ParentWindow.AreaList[0], ParentArea.ParentWindow.AreaList[0].AvailWidthArea());
|
||||
AreaList.ElementAt(i).SearchAreaList(AreaList.ElementAt(i), width, "Width");
|
||||
double dim = currSplitDim.dDimension;
|
||||
if (!(currSplitDim.MeasureType.Equals(MeasureTypes.ABSOLUTE)))
|
||||
{
|
||||
double height = ParentArea.CalculateHeightArea(ParentArea.ParentWindow.AreaList[0], ParentArea.ParentWindow.AreaList[0].AvailHeightArea());
|
||||
foreach (var elem in ElemDimHorizList)
|
||||
height = height - elem.dDimension;
|
||||
dim = currSplitDim.ConvertDimension(dimList, currSplitDim.MeasureType, MeasureTypes.ABSOLUTE, height, -1, 0);
|
||||
}
|
||||
AreaList.ElementAt(i).SearchAreaList(AreaList.ElementAt(i), dim, "Height");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (SplitVertList.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < AreaList.Count; i++)
|
||||
{
|
||||
if (i < SplitVertList.Count)
|
||||
{
|
||||
SplitDimension currSplitDim = SplitVertList[i];
|
||||
List<AreaDimension> dimList = new List<AreaDimension>();
|
||||
foreach (var itemDim in SplitVertList)
|
||||
dimList.Add(new AreaDimension(itemDim.dDimension, itemDim.MeasureType, itemDim.Parent));
|
||||
double dim = currSplitDim.dDimension;
|
||||
if (!(currSplitDim.MeasureType.Equals(MeasureTypes.ABSOLUTE)))
|
||||
{
|
||||
double width = ParentArea.CalculateWidthArea(ParentArea.ParentWindow.AreaList[0], ParentArea.ParentWindow.AreaList[0].AvailWidthArea());
|
||||
foreach (var elem in ElemDimVertList)
|
||||
width = width - elem.dDimension;
|
||||
dim = currSplitDim.ConvertDimension(dimList, currSplitDim.MeasureType, MeasureTypes.ABSOLUTE, width, -1, 0);
|
||||
}
|
||||
AreaList.ElementAt(i).SearchAreaList(AreaList.ElementAt(i), dim, "Width");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Internal Methods
|
||||
|
||||
#region Private Fields
|
||||
|
||||
Reference in New Issue
Block a user