diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor index 749aa48..fc89036 100644 --- a/WebWindowComplex/Compo/CardFrame.razor +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -73,7 +73,7 @@
- @if (SashGroupList.Count == 0) + @if (SashNotInBottom()) {
Bottom rail
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index 374dd52..add2afe 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -341,6 +341,15 @@ namespace WebWindowComplex.Compo private bool ForceChangeAll = false; + private bool SashNotInBottom() + { + bool ans = false; + if (CurrFrameWindow.AreaList[0] is Fill || + (CurrFrameWindow.AreaList[0] is Split && CurrFrameWindow.AreaList[0].AreaList[0].AreaList[0] is Fill)) + ans = true; + return ans; + } + /// /// Metodo per la visualizzazione dei pulsanti joint /// diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index eccd541..27bdd8d 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -317,9 +317,8 @@ namespace WebWindowComplex.Models } else if (s.SashList.First().ElementDimensionList.Count > 0) { - if (s.ParentArea is Split split && split.SplitHorizList.Count > 0) - dimTot = dimTot + s.SashList.ElementAt(i).ElementDimensionList.First().dOverlap - + s.SashList.ElementAt(i).ElementDimensionList.ElementAt(s.SashList.ElementAt(i).ElementDimensionList.Count() - 2).dOverlap; + if (s.ParentArea.ParentArea is Split split && split.SplitHorizList.Count > 0) + dimTot = dimTot + s.SashList.ElementAt(i).ElementDimensionList.First().dOverlap + s.SashList.ElementAt(i).ElementDimensionList.ElementAt(s.SashList.ElementAt(i).ElementDimensionList.Count() - 2).dOverlap; if (s.SashBottomRailQty > 0) { foreach (var bottomRail in s.BottomRailElemDimList) @@ -343,12 +342,15 @@ namespace WebWindowComplex.Models if (nameDim.Equals("Width")) { if (s.AreaList.ElementAt(i).AreaList.First() is Sash sash && sash != null) - dimTot = dimTot + sash.SashList.Last().ElementDimensionList.ElementAt(1).dOverlap - + sash.SashList.First().ElementDimensionList.Last().dOverlap; + dimTot = dimTot + sash.SashList.Last().ElementDimensionList.ElementAt(1).dOverlap + sash.SashList.First().ElementDimensionList.Last().dOverlap; SearchAreaList(node.AreaList.ElementAt(i), dimTot, nameDim); } else + { + foreach (var item in s.ElemDimHorizList) + dimTot = dimTot - item.dDimension; SearchAreaList(node.AreaList.ElementAt(i), s.SplitHorizList.ElementAt(i).CalculateAbsoluteValue(dimList, dimTot), nameDim); + } } if (s.SplitVertList.Count > 0 && i < s.SplitVertList.Count) { diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index c6af589..c433cee 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.4.1413 + 3.1.4.1415 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -133,6 +133,11 @@ + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 6115a5d..9c796dd 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.4.1413 + 3.1.4.1415 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -219,6 +219,17 @@ + + + + + + + + + + +