Egalware/webwindowconfigurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiornamento

Browse Source
This commit is contained in:
Annamaria Sassi
2026-08-13 14:48:23 +02:00
parent c0b8bc752c
commit 809ff5a237
33 changed files with 183 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/TableComp.razor.cs
+23 -21
View File
@@ -241,8 +241,6 @@ namespace WebWindowComplex
if (m_CurrWindow != null && m_CurrWindow.AreaList != null && m_CurrWindow.AreaList.Count > 0)
{
checkWarnings();
//if (SashGroupList.Count > 0)
// currAntaIndex = 0;
if (updRequested)
{
// se mancasse dizionario forme chiamo quello
@@ -314,8 +312,6 @@ namespace WebWindowComplex
private static Logger Log = LogManager.GetCurrentClassLogger();
//private int currAntaIndex = 0;
private int currFillIndex = -1;
private List<string> currLoading = new List<string>();
@@ -1361,16 +1357,16 @@ namespace WebWindowComplex
if (m_PreviousWindow != null)
{
for (int i = 0; i < 2; i++)
m_CurrWindow.AreaList.First().DimensionList[i].dDimension = m_PreviousWindow.AreaList.First().DimensionList[i].dDimension;
FrameWindow.DimensionList[i].dDimension = m_PreviousWindow.AreaList.First().DimensionList[i].dDimension;
if (m_CurrWindow.AreaList.First().Shape == Shapes.TRIANGLE)
{
for (int i = 0; i < 2; i++)
m_CurrWindow.AreaList.First().JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
FrameWindow.JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
}
else
{
for (int i = 0; i < 4; i++)
m_CurrWindow.AreaList.First().JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
FrameWindow.JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
}
}
if (m_CurrWindow != null)
@@ -1404,8 +1400,6 @@ namespace WebWindowComplex
prevHardware[i] = SashGroupList.ElementAt(i).SelHardware;
}
}
//if (SashGroupList.Count > 0)
// currAntaIndex = 0;
// Aggiorno window con dati shape e hw option
UpdateDict();
}
@@ -2215,24 +2209,32 @@ namespace WebWindowComplex
SpElemList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
SpElemList.ElementAt(i).SetMinDimension(Window.m_ParameterList.GetValueOrDefault(SpElemList.ElementAt(i).sName + "_DimMin"));
SpElemList.ElementAt(i).SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(SpElemList.ElementAt(i).sName + "_DimMax"));
if (SpElemList.ElementAt(i).dDimension > SpElemList.ElementAt(i).dMaxDim)
if (SpElemList.ElementAt(i).dDimension > SpElemList.ElementAt(i).dMaxDim || SpElemList.ElementAt(i).dDimension < SpElemList.ElementAt(i).dMinDim)
{
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMaxDim);
Frame frame = split.ParentWindow.AreaList.First();
if (frame != null)
if (SpElemList.ElementAt(i).dDimension > SpElemList.ElementAt(i).dMaxDim)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMaxDim);
}
else if (SpElemList.ElementAt(i).dDimension < SpElemList.ElementAt(i).dMinDim)
{
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMinDim);
}
}
else if (SpElemList.ElementAt(i).dDimension < SpElemList.ElementAt(i).dMinDim)
{
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMinDim);
Frame frame = split.ParentWindow.AreaList.First();
if (frame != null)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
switch (split.SelSplitShape)
{
case SplitShapes.VERTICAL:
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
break;
case SplitShapes.HORIZONTAL:
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
break;
default:
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
break;
}
}
}
string overlapName = string.Join("_", SpElemList.ElementAt(i).sName.Split('_').Skip(1));