Correzioni
This commit is contained in:
@@ -73,7 +73,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 col-lg-6">
|
||||
@if (SashGroupList.Count == 0)
|
||||
@if (SashNotInBottom())
|
||||
{
|
||||
<div class="d-flex justify-content-start align-items-center" style="min-height: 2.5rem;">
|
||||
<h6 class="fw-bold">Bottom rail</h6>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Metodo per la visualizzazione dei pulsanti joint
|
||||
/// </summary>
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Version>3.1.4.1413</Version>
|
||||
<Version>3.1.4.1415</Version>
|
||||
<Authors>Annamaria Sassi</Authors>
|
||||
<Company>Egalware</Company>
|
||||
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
|
||||
@@ -133,6 +133,11 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Version>3.1.4.1413</Version>
|
||||
<Version>3.1.4.1415</Version>
|
||||
<Authors>Annamaria Sassi</Authors>
|
||||
<Company>Egalware</Company>
|
||||
<Description>Componente gestione JWD per LUX</Description>
|
||||
@@ -219,6 +219,17 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user