- Modificata gestione overlap
- Modificato aggiornamento dimensioni a cascata
This commit is contained in:
@@ -90,22 +90,22 @@ namespace WebWindowComplex.Models
|
||||
m_SelThreshold = newThreshold;
|
||||
else
|
||||
m_SelThreshold = new Threshold(3, "Bottom");
|
||||
string profileName = "";
|
||||
if (m_SelThreshold.Name.Equals("Threshold"))
|
||||
{
|
||||
ElementDimensionList.First().SetNameElement("Frame_Sash_Threshold");
|
||||
ElementDimensionList.First().SetMinDimension(Window.m_ParameterList.GetValueOrDefault(ElementDimensionList.First().sName + "_DimMin"));
|
||||
ElementDimensionList.First().SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(ElementDimensionList.First().sName + "_DimMax"));
|
||||
ElementDimensionList.First().SetDimension(Window.m_ParameterList.GetValueOrDefault(ElementDimensionList.First().sName + "_DimStd"));
|
||||
string overlapName = "Sash_Bottom_Overlap";
|
||||
ElementDimensionList.First().SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(overlapName));
|
||||
}
|
||||
profileName = "Frame_Sash_Threshold";
|
||||
else
|
||||
profileName = "Frame_Sash_Bottom";
|
||||
ElementDimensionList.First().SetNameElement(profileName);
|
||||
ElementDimensionList.First().SetMinDimension(Window.m_ParameterList.GetValueOrDefault(profileName + "_DimMin"));
|
||||
ElementDimensionList.First().SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(profileName + "_DimMax"));
|
||||
ElementDimensionList.First().SetDimension(Window.m_ParameterList.GetValueOrDefault(profileName + "_DimStd"));
|
||||
string overlapName = "Sash_Bottom_Overlap";
|
||||
ElementDimensionList.First().SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(overlapName));
|
||||
if (AreaList.Count > 0)
|
||||
{
|
||||
SearchAreaList(this, AvailWidthArea(), "Width");
|
||||
SearchAreaList(this, AvailHeightArea(), "Height");
|
||||
}
|
||||
|
||||
//ElementDimensionList.Clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -453,6 +453,11 @@ namespace WebWindowComplex.Models
|
||||
if (AreaList.First() is Sash)
|
||||
overlap = ElementDimensionList.First().dOverlap +
|
||||
ElementDimensionList.ElementAt(ElementDimensionList.Count() - 2).dOverlap;
|
||||
if(BottomRailQty > 0)
|
||||
{
|
||||
foreach (var bottomRail in BottomRailElemDimList)
|
||||
dim = dim - bottomRail.dDimension;
|
||||
}
|
||||
return dim - ElementDimensionList.First().dDimension -
|
||||
ElementDimensionList.ElementAt(ElementDimensionList.Count() - 2).dDimension +
|
||||
overlap;
|
||||
@@ -476,12 +481,12 @@ namespace WebWindowComplex.Models
|
||||
if(AreaList.First() is Sash)
|
||||
overlap = ElementDimensionList.ElementAt(1).dOverlap +
|
||||
ElementDimensionList.Last().dOverlap;
|
||||
if (AreaList.First() is Split split)
|
||||
{
|
||||
if(split.SplitHorizList.Count > 0)
|
||||
overlap = ElementDimensionList.ElementAt(1).dOverlap +
|
||||
ElementDimensionList.Last().dOverlap;
|
||||
}
|
||||
//if (AreaList.First() is Split split)
|
||||
//{
|
||||
// if(split.SplitHorizList.Count > 0)
|
||||
// overlap = ElementDimensionList.ElementAt(1).dOverlap +
|
||||
// ElementDimensionList.Last().dOverlap;
|
||||
//}
|
||||
return dim - ElementDimensionList.ElementAt(1).dDimension -
|
||||
ElementDimensionList.Last().dDimension +
|
||||
overlap;
|
||||
|
||||
Reference in New Issue
Block a user