diff --git a/Test.UI/Components/Layout/NavMenu.razor b/Test.UI/Components/Layout/NavMenu.razor index eb95e5d..0e43fd4 100644 --- a/Test.UI/Components/Layout/NavMenu.razor +++ b/Test.UI/Components/Layout/NavMenu.razor @@ -3,14 +3,14 @@ @inject NavigationManager NavigationManager
-
+
@if (!showText) { - Wind + Wind } else { - Window + Window }
diff --git a/WebWindow.Base/WebWindow.Base.csproj b/WebWindow.Base/WebWindow.Base.csproj index 79c0055..c63da39 100644 --- a/WebWindow.Base/WebWindow.Base.csproj +++ b/WebWindow.Base/WebWindow.Base.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.214 + 2.7.10.313 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -58,6 +58,17 @@ + + + + + + + + + + + diff --git a/WebWindowComplex/ItemTable.cs b/WebWindowComplex/ItemTable.cs index b437138..08d8c0c 100644 --- a/WebWindowComplex/ItemTable.cs +++ b/WebWindowComplex/ItemTable.cs @@ -62,36 +62,19 @@ namespace WebWindowComplex } /// - /// Indica l'indice rispetto al vettore dei fill - /// Se non è un fill vale -1 + /// Indica l'indice rispetto al vettore del tipo corrispondente + /// Se non è uno split/sash/fill vale -1 /// - private int m_numFill; - public int NumFill + private int m_indexItem; + public int IndexItem { get { - return m_numFill; + return m_indexItem; } set { - m_numFill = value; - } - } - - /// - /// Indica l'indice rispetto al vettore delle sash - /// Se non è una sash vale -1 - /// - private int m_numSash; - public int NumSash - { - get - { - return m_numSash; - } - set - { - m_numSash = value; + m_indexItem = value; } } @@ -112,14 +95,13 @@ namespace WebWindowComplex } } - public ItemTable(AreaTypes elementType, string s_description, int n_row, int n_col, int n_numFill, int n_numSash, int n_numChild) + public ItemTable(AreaTypes elementType, string s_description, int n_row, int n_col, int n_numItem, int n_numChild) { Type = elementType; m_desc = s_description; Row = n_row; Col = n_col; - NumFill = n_numFill; - NumSash = n_numSash; + IndexItem = n_numItem; NumChild = n_numChild; } } diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index de68516..275acea 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -7,7 +7,7 @@