From 12ee118e7260f1220e95e7f8b0a144dfa4f3eb06 Mon Sep 17 00:00:00 2001
From: NICOLA CARMINATI <ncarminati@corp.scmgroup.com>
Date: Tue, 8 Sep 2020 18:08:02 +0200
Subject: [PATCH] Fix OnScreenKeyboard Option

---
 Client/View/MainForm.cs | 4 ++--
 Client/View/NcWindow.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Client/View/MainForm.cs b/Client/View/MainForm.cs
index 3df83161..88145e34 100644
--- a/Client/View/MainForm.cs
+++ b/Client/View/MainForm.cs
@@ -165,7 +165,7 @@ namespace Active_Client.View
         public void sendClose()
         {
             //Close Virtual Keyboard Runtime
-            if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10)
+            if (Config.ClientConfig.ShowVirtualKeyboard)
                 NcWindow.closeVirtualKeyboard();
 
             //Close the NC HMI && Stop Following Nc
@@ -259,7 +259,7 @@ namespace Active_Client.View
             Browser.DisplayHandler.OnConsoleMessage += BrowserConsoleMessage;
             Browser.DownloadHandler.OnBeforeDownload += BeforeDownload;
             //Filter only < Win_10 Platform
-            if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10)
+            if (Config.ClientConfig.ShowVirtualKeyboard)
                 ChromiumWebBrowser.RemoteProcessCreated += (e) => { e.RenderProcessHandler.OnFocusedNodeChanged += BrowserNodeChanged; };
         }
 
diff --git a/Client/View/NcWindow.cs b/Client/View/NcWindow.cs
index b3753fde..f79e2f71 100644
--- a/Client/View/NcWindow.cs
+++ b/Client/View/NcWindow.cs
@@ -1047,7 +1047,7 @@ namespace Active_Client.View
                 if (!IsIconic(MainViewHandle))
                 {
                     //Show Virtual keyboard
-                    if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10)
+                    if (Config.ClientConfig.ShowVirtualKeyboard)
                         reOpenVirtualKeyboard();
                 }
             }
@@ -1069,7 +1069,7 @@ namespace Active_Client.View
                 //SetForegroundWindow(hwnd);
 
                 //Hide Virtual keyboard
-                if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10 && KeyboardPID != 0 && ActualPID != KeyboardPID)
+                if (Config.ClientConfig.ShowVirtualKeyboard && KeyboardPID != 0 && ActualPID != KeyboardPID)
                     closeVirtualKeyboard();
             }