From bab6831f718999878773ca0ba1ac445cfe1ae43b Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Tue, 10 Mar 2026 09:57:12 +0100 Subject: [PATCH] Modificati bottoni misure e joint --- WebWindowComplex/Compo/AreaSash.razor | 13 +++++-- WebWindowComplex/Compo/CardFrame.razor | 23 +++++------- WebWindowComplex/Compo/CardSashGroup.razor | 17 ++++++++- WebWindowComplex/Compo/CardSplit.razor | 37 +++++++++---------- WebWindowComplex/Compo/CardSplit.razor.cs | 24 ++++++------ WebWindowComplex/Models/SplitDimension.cs | 13 +++++-- WebWindowComplex/WebWindowComplex.csproj | 5 ++- .../WebWindowConfigurator.csproj | 12 +++++- 8 files changed, 90 insertions(+), 54 deletions(-) diff --git a/WebWindowComplex/Compo/AreaSash.razor b/WebWindowComplex/Compo/AreaSash.razor index dd88553..b81e1a8 100644 --- a/WebWindowComplex/Compo/AreaSash.razor +++ b/WebWindowComplex/Compo/AreaSash.razor @@ -184,12 +184,19 @@
-
+
Joints
@if (!User) { -
+
+
+ + + +
+
+ @*
@@ -207,7 +214,7 @@
- } + } *@ @*
+ + +
+
+ @*
@@ -123,17 +130,7 @@
- } - @*
-
- - -
-
*@ + } *@ @*
-
+
*@ @*
@*
-
- Misure: -
-
- -
-
- -
*@ -
+
+
+ +
+
+ +
+
+
Split
@if (!User) { @@ -61,11 +60,11 @@
} - *@
diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs index e4980ac..297f25e 100644 --- a/WebWindowComplex/Compo/CardSplit.razor.cs +++ b/WebWindowComplex/Compo/CardSplit.razor.cs @@ -357,10 +357,10 @@ namespace WebWindowComplex.Compo else type = CurrSplit.SplitHorizList.First().SelMeasureType; for (int i = 1; i < CurrSplit.SplitVertList.Count; i++) - { - if (CurrSplit.SplitVertList.ElementAt(i).SelMeasureType != type) - return MeasureTypes.NULL; - } + { + if (CurrSplit.SplitVertList.ElementAt(i).SelMeasureType != type) + return MeasureTypes.NULL; + } for (int i = 1; i < CurrSplit.SplitHorizList.Count; i++) { if (CurrSplit.SplitHorizList.ElementAt(i).SelMeasureType != type) @@ -372,20 +372,20 @@ namespace WebWindowComplex.Compo { foreach (var item in CurrSplit.SplitVertList) { - item.SelMeasureType = value; - //item.SetSelMeasureType(type); + item.SelMeasureTypeIndex = (int)value; + //item.SetSelMeasureType(value); } foreach (var item in CurrSplit.SplitHorizList) { - item.SelMeasureType = value; - //item.SetSelMeasureType(type); + item.SelMeasureTypeIndex = (int)value; + //item.SetSelMeasureType(value); } var args = new DataUpdateSplit() { currSplit = CurrSplit, noSvg = true }; - _= EC_UpdateSplit.InvokeAsync(args); + _ = EC_UpdateSplit.InvokeAsync(args); } } @@ -432,14 +432,14 @@ namespace WebWindowComplex.Compo for (int i = 0; i < CurrSplit.SplitVertList.Count; i++) { if (!CurrSplit.SplitVertList.ElementAt(i).MeasureType.Equals(type)) - return "dropdown-item"; + return "btn btn-outline-secondary"; } for (int i = 0; i < CurrSplit.SplitHorizList.Count; i++) { if (!CurrSplit.SplitHorizList.ElementAt(i).MeasureType.Equals(type)) - return "dropdown-item"; + return "btn btn-outline-secondary"; } - return "dropdown-item fw-bold"; + return "btn btn-secondary"; } } diff --git a/WebWindowComplex/Models/SplitDimension.cs b/WebWindowComplex/Models/SplitDimension.cs index 6053e0b..caa9874 100644 --- a/WebWindowComplex/Models/SplitDimension.cs +++ b/WebWindowComplex/Models/SplitDimension.cs @@ -629,9 +629,9 @@ namespace WebWindowComplex.Models { splitList = m_Parent.SplitHorizList; if (Parent.bSplitStartVert) - splitElemList = m_Parent.ElemDimHorizList; - else splitElemList = m_Parent.ElemDimHorizList.Where(x => x.nSubArea == 1).ToList(); + else + splitElemList = m_Parent.ElemDimHorizList; dimSplitGroup = (CalculateHeightSplitGroup(frame, frame.AvailHeightArea(), new AreaFound(-1, false))).m_Dimension; } AreaDimension ad = new AreaDimension(dDimension, SelMeasureType, Parent); @@ -644,7 +644,14 @@ namespace WebWindowComplex.Models { dimSplitGroup = dimSplitGroup - item.dDimension; } - m_dDimension = ad.ConvertDimension(adList, m_SelMeasureType, newType, dimSplitGroup, splitList.IndexOf(this)); + if (newType is MeasureTypes.PROPORTIONAL) + { + adList = ad.CalculatePropVal(adList, splitList.IndexOf(this), dimSplitGroup); + for (int i = 0; i < adList.Count; i++) + splitList.ElementAt(i).SetDimension(adList.ElementAt(i).dDimension); + } + else + m_dDimension = ad.ConvertDimension(adList, m_SelMeasureType, newType, dimSplitGroup, splitList.IndexOf(this)); m_SelMeasureType = (MeasureTypes)value; } } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 18aec2e..032a03c 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.917 + 3.1.3.1009 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -319,6 +319,9 @@ + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index c1cb9ca..60edf00 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.918 + 3.1.3.1009 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -342,6 +342,16 @@ + + + + + + + + + +