From 020f4b83fb661132da9cc2fae7d6b1d9c0ff3a8a Mon Sep 17 00:00:00 2001
From: Renzo Lanza <renzo.l@egaltech.com>
Date: Tue, 4 Feb 2020 08:08:42 +0000
Subject: [PATCH] LicenseManager 2.2b1 : - Correzione TextBox Nesting encrypted
 string in modo che il tasto Home porti all'inizio della stringa - Correzione
 LicenceBox che ora torna in primo piano quando, passando da una finestra
 all'altra, si riattiva la finestra di LicenseManager

---
 LicenceBox/LicenceBoxV.xaml.vb               | 10 ++++++++++
 My Project/AssemblyInfo.vb                   |  4 ++--
 NewLicencePage/NewLicencePageV.xaml          |  2 +-
 SearchLicencePage/SearchLicencePageV.xaml.vb |  1 +
 UpdateLicencePage/UpdateLicencePageV.xaml    |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/LicenceBox/LicenceBoxV.xaml.vb b/LicenceBox/LicenceBoxV.xaml.vb
index 3f423c7..480c5aa 100644
--- a/LicenceBox/LicenceBoxV.xaml.vb
+++ b/LicenceBox/LicenceBoxV.xaml.vb
@@ -41,5 +41,15 @@ Public Class LicenceBoxV
       MessageBox.Show("Licenza scaricata correttamente")
    End Sub
 
+   'Private Sub Window_Activated(sender As Object, e As EventArgs)
+   '   Dim Window As Window = DirectCast(sender, Window)
+   '   Window.Topmost = True
+   'End Sub
+
+   'Private Sub Window_Deactivated(sender As Object, e As EventArgs)
+   '   Dim Window As Window = DirectCast(sender, Window)
+   '   Window.Topmost = False
+   'End Sub
+
 End Class
 
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 5719c6b..9ecef78 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -59,5 +59,5 @@ Imports System.Windows
 ' usando l'asterisco '*' come illustrato di seguito:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.2.1.1")>
-<Assembly: AssemblyFileVersion("2.2.1.1")>
+<Assembly: AssemblyVersion("2.2.2.1")>
+<Assembly: AssemblyFileVersion("2.2.2.1")>
diff --git a/NewLicencePage/NewLicencePageV.xaml b/NewLicencePage/NewLicencePageV.xaml
index fe32e17..2f44dec 100644
--- a/NewLicencePage/NewLicencePageV.xaml
+++ b/NewLicencePage/NewLicencePageV.xaml
@@ -174,7 +174,7 @@
                                Text="{Binding NestKey, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
                           Grid.Column="1"
                           Grid.Row="5"
-                          Style="{StaticResource ParameterTextBox}" TextWrapping="Wrap" AcceptsReturn="True" HorizontalContentAlignment="Left" Width="Auto" />
+                          Style="{StaticResource ParameterTextBox}" HorizontalContentAlignment="Left" Width="Auto" />
 
         <TextBlock Text="{Binding NestDeadlineMsg}"
               Grid.Column="2"
diff --git a/SearchLicencePage/SearchLicencePageV.xaml.vb b/SearchLicencePage/SearchLicencePageV.xaml.vb
index dce598f..79da999 100644
--- a/SearchLicencePage/SearchLicencePageV.xaml.vb
+++ b/SearchLicencePage/SearchLicencePageV.xaml.vb
@@ -13,6 +13,7 @@
          LicBox.Height = 700
          LicBox.Width = 1100
          LicBox.HorizontalAlignment = HorizontalAlignment.Center
+         LicBox.Owner = Application.Current.MainWindow
          LicBox.ShowDialog()
       End If
    End Sub
diff --git a/UpdateLicencePage/UpdateLicencePageV.xaml b/UpdateLicencePage/UpdateLicencePageV.xaml
index 92020a5..5e4f2f6 100644
--- a/UpdateLicencePage/UpdateLicencePageV.xaml
+++ b/UpdateLicencePage/UpdateLicencePageV.xaml
@@ -156,7 +156,7 @@
                                Text="{Binding NestKey, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
                           Grid.Column="1"
                           Grid.Row="5"
-                          Style="{StaticResource ParameterTextBox}" TextWrapping="Wrap" AcceptsReturn="True" HorizontalContentAlignment="Left" Width="Auto" />
+                          Style="{StaticResource ParameterTextBox}" HorizontalContentAlignment="Left" Width="Auto" />
 
         <TextBlock Text="{Binding NestDeadlineMsg}"
               Grid.Column="2"