From 179074f534dbf7c69ed9d7e545bc81d44f1dfa58 Mon Sep 17 00:00:00 2001
From: Guoyu Ou <benogy@gmail.com>
Date: Tue, 23 Jun 2026 12:21:39 +0800
Subject: [PATCH 1/2] upgrade to .net 4.8

---
 Settings/Settings.csproj                        |  2 +-
 Win32/Win32.csproj                              | 15 ++++++---------
 WtDesktop/WtDesktop.fsproj                      | 17 ++++++++++++++---
 WtGroup/WtGroup.fsproj                          | 17 ++++++++++++++---
 WtLauncher/WtLauncher.fsproj                    | 17 ++++++++++++++---
 WtProgram/App.config                            |  2 +-
 WtProgram/WtProgram.fsproj                      |  2 +-
 WtProgram/packages.config                       | 14 +++++++-------
 WtSetup/WtSetup.vdproj                          |  6 +++---
 treeviewadv/Aga.Controls/Aga.Controls.csproj    |  2 ++
 treeviewadv/SampleApp/SampleApp.csproj          |  2 ++
 .../UnitTests/Aga.Controls.UnitTests.csproj     |  2 ++
 12 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/Settings/Settings.csproj b/Settings/Settings.csproj
index e2ef873..f29a405 100755
--- a/Settings/Settings.csproj
+++ b/Settings/Settings.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Bemo</RootNamespace>
     <AssemblyName>Bemo.Settings</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
diff --git a/Win32/Win32.csproj b/Win32/Win32.csproj
index f21b99e..11cdbfb 100755
--- a/Win32/Win32.csproj
+++ b/Win32/Win32.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Bemo.Win32</RootNamespace>
     <AssemblyName>Win32</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -48,6 +48,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>0649</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -59,6 +60,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>649</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -98,14 +100,9 @@
     <Compile Include="WinUser.cs" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+    <BootstrapperPackage Include="Microsoft.Net.Framework.4.8">
       <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <ProductName>.NET Framework 4.8</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
diff --git a/WtDesktop/WtDesktop.fsproj b/WtDesktop/WtDesktop.fsproj
index 74c8110..86a7861 100755
--- a/WtDesktop/WtDesktop.fsproj
+++ b/WtDesktop/WtDesktop.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>WtDesktop</RootNamespace>
     <AssemblyName>WtDesktop</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Name>WtDesktop</Name>
     <SccProjectName>&lt;Project Location In Database&gt;</SccProjectName>
     <SccProvider>Mercurial Source Control Package</SccProvider>
@@ -68,8 +68,19 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 	     Other similar extension points exist, see Microsoft.Common.targets.
 	<Target Name="BeforeBuild">
diff --git a/WtGroup/WtGroup.fsproj b/WtGroup/WtGroup.fsproj
index 8b98ff0..bf4a13f 100755
--- a/WtGroup/WtGroup.fsproj
+++ b/WtGroup/WtGroup.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>WtGroup</RootNamespace>
     <AssemblyName>WtGroup</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Name>WtGroup</Name>
     <SccProjectName>&lt;Project Location In Database&gt;</SccProjectName>
     <SccProvider>Mercurial Source Control Package</SccProvider>
@@ -60,8 +60,19 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 	     Other similar extension points exist, see Microsoft.Common.targets.
 	<Target Name="BeforeBuild">
diff --git a/WtLauncher/WtLauncher.fsproj b/WtLauncher/WtLauncher.fsproj
index c76c1c7..5f964cf 100755
--- a/WtLauncher/WtLauncher.fsproj
+++ b/WtLauncher/WtLauncher.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>WtLauncher</RootNamespace>
     <AssemblyName>WtLauncher</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Name>WtLauncher</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -47,8 +47,19 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 	     Other similar extension points exist, see Microsoft.Common.targets.
 	<Target Name="BeforeBuild">
diff --git a/WtProgram/App.config b/WtProgram/App.config
index d92f3b5..1faeb11 100755
--- a/WtProgram/App.config
+++ b/WtProgram/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/WtProgram/WtProgram.fsproj b/WtProgram/WtProgram.fsproj
index a4552f5..e47c180 100755
--- a/WtProgram/WtProgram.fsproj
+++ b/WtProgram/WtProgram.fsproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>WindowTabs</RootNamespace>
     <AssemblyName>WindowTabs</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Name>WtProgram</Name>
     <TargetFrameworkProfile />
     <SccProjectName>&lt;Project Location In Database&gt;</SccProjectName>
diff --git a/WtProgram/packages.config b/WtProgram/packages.config
index b4fe80a..79fe104 100644
--- a/WtProgram/packages.config
+++ b/WtProgram/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FSharp.Core.4.3.0.0.Microsoft.Signed" version="3.0.0.1" targetFramework="net40" />
-  <package id="FSPowerPack.Community" version="3.0.0.0" targetFramework="net40" />
-  <package id="FSPowerPack.Core.Community" version="3.0.0.0" targetFramework="net462" />
-  <package id="FSPowerPack.Linq.Community" version="3.0.0.0" targetFramework="net462" />
-  <package id="FSPowerPack.Metadata.Community" version="3.0.0.0" targetFramework="net462" />
-  <package id="FSPowerPack.Parallel.Seq.Community" version="3.0.0.0" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.3.0" targetFramework="net40" />
+  <package id="FSharp.Core.4.3.0.0.Microsoft.Signed" version="3.0.0.1" targetFramework="net48" />
+  <package id="FSPowerPack.Community" version="3.0.0.0" targetFramework="net48" />
+  <package id="FSPowerPack.Core.Community" version="3.0.0.0" targetFramework="net48" />
+  <package id="FSPowerPack.Linq.Community" version="3.0.0.0" targetFramework="net48" />
+  <package id="FSPowerPack.Metadata.Community" version="3.0.0.0" targetFramework="net48" />
+  <package id="FSPowerPack.Parallel.Seq.Community" version="3.0.0.0" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/WtSetup/WtSetup.vdproj b/WtSetup/WtSetup.vdproj
index ccd7b3e..4cc16ef 100755
--- a/WtSetup/WtSetup.vdproj
+++ b/WtSetup/WtSetup.vdproj
@@ -58,10 +58,10 @@
             "ComponentsUrl" = "8:"
                 "Items"
                 {
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client"
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.8"
                     {
-                    "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)"
-                    "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client"
+                    "Name" = "8:Microsoft .NET Framework 4.8 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.8"
                     }
                     "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
                     {
diff --git a/treeviewadv/Aga.Controls/Aga.Controls.csproj b/treeviewadv/Aga.Controls/Aga.Controls.csproj
index 531ec91..45595f6 100755
--- a/treeviewadv/Aga.Controls/Aga.Controls.csproj
+++ b/treeviewadv/Aga.Controls/Aga.Controls.csproj
@@ -19,6 +19,8 @@
     </SccProvider>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
diff --git a/treeviewadv/SampleApp/SampleApp.csproj b/treeviewadv/SampleApp/SampleApp.csproj
index b0d3895..9ba9efc 100755
--- a/treeviewadv/SampleApp/SampleApp.csproj
+++ b/treeviewadv/SampleApp/SampleApp.csproj
@@ -9,6 +9,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SampleApp</RootNamespace>
     <AssemblyName>SampleApp</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
diff --git a/treeviewadv/UnitTests/Aga.Controls.UnitTests.csproj b/treeviewadv/UnitTests/Aga.Controls.UnitTests.csproj
index 53448d8..df9f181 100755
--- a/treeviewadv/UnitTests/Aga.Controls.UnitTests.csproj
+++ b/treeviewadv/UnitTests/Aga.Controls.UnitTests.csproj
@@ -12,6 +12,8 @@
     <WarningLevel>4</WarningLevel>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SignAssembly>true</SignAssembly>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>

From 1ba5f14f0679af3258bb142f6a14c83585deef20 Mon Sep 17 00:00:00 2001
From: Guoyu Ou <benogy@gmail.com>
Date: Tue, 23 Jun 2026 12:21:39 +0800
Subject: [PATCH 2/2] use Alt-1,2,... to switch tabs

Closes #45
---
 WtProgram/Desktop.fs                          |  4 +-
 .../DesktopPlugins/InputManagerPlugin.fs      | 48 +++++++++++++++++--
 .../GroupPlugins/NumericTabHotKeyPlugin.fs    | 20 ++++----
 .../ManagerViewService/Views/BehaviorView.fs  |  2 +-
 WtProgram/Properties/Resources.ja-JP.resx     |  4 +-
 WtProgram/Properties/Resources.resx           |  4 +-
 WtProgram/Settings.fs                         |  4 +-
 WtProgram/Shared/ProgramTypes.fs              |  2 +-
 8 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/WtProgram/Desktop.fs b/WtProgram/Desktop.fs
index 60926dc..fde2789 100755
--- a/WtProgram/Desktop.fs
+++ b/WtProgram/Desktop.fs
@@ -10,11 +10,11 @@ type GroupInfo(enableSuperBar) as this =
     let windowsCell = Cell.create(List2())
     let mutable _isExited = false
     let desktopInvoker = InvokerService.invoker
-    let enableCtrlNumberHotKey = Services.settings.getValue("enableCtrlNumberHotKey").cast<bool>()
+    let enableAltNumberHotKey = Services.settings.getValue("enableAltNumberHotKey").cast<bool>()
     let (_group, invoker) = ThreadHelper.startOnThreadAndWait <| fun() ->
         let plugins = List2<_>([
             Some(MouseScrollPlugin().cast<IPlugin>())
-            (if enableCtrlNumberHotKey then Some(NumericTabHotKeyPlugin().cast<IPlugin>()) else None)
+            (if enableAltNumberHotKey then Some(NumericTabHotKeyPlugin().cast<IPlugin>()) else None)
             Some(HideTabsOnInactiveGroupPlugin().cast<IPlugin>())
             (if enableSuperBar then Some(SuperBarPlugin().cast<IPlugin>()) else None)
             ])
diff --git a/WtProgram/DesktopPlugins/InputManagerPlugin.fs b/WtProgram/DesktopPlugins/InputManagerPlugin.fs
index cadbb7b..d1caf4f 100755
--- a/WtProgram/DesktopPlugins/InputManagerPlugin.fs
+++ b/WtProgram/DesktopPlugins/InputManagerPlugin.fs
@@ -6,11 +6,22 @@ type InputManagerPlugin(msgSet:Set2<Int32>) as this =
     let hookProcDelegate = HOOKPROC(this.llHook)
     let mutable kbHook = null
     let OS = OS()
+    let handledNumericTabKeys = System.Collections.Generic.HashSet<int>()
 
     member this.desktop = Services.desktop
 
     member this.foregroundGroup = Services.desktop.foregroundGroup
 
+    member this.enableAltNumberHotKey =
+        Services.settings.getValue("enableAltNumberHotKey").cast<bool>()
+
+    member this.vkToTabIndex(msg) =
+        let index = msg - 0x31
+        if index >= 0 && index < 9 then
+            Some(index)
+        else
+            None
+
     member this.llHook nCode (wParam:IntPtr) lParam = 
         let msg = wParam.ToInt32()
         if msgSet.contains(msg) then
@@ -27,13 +38,40 @@ type InputManagerPlugin(msgSet:Set2<Int32>) as this =
     member this.registerMouseLLHook() =
         WinUserApi.SetWindowsHookEx(WindowHookTypes.WH_MOUSE_LL, hookProcDelegate, IntPtr.Zero, 0).ignore
 
+    member this.tryHandleNumericTabHotKey(key:IntPtr, data:KBDLLHOOKSTRUCT) =
+        let msg = int(key)
+        let vkCode = data.vkCode
+        let isKeyDown =
+            msg = WindowMessages.WM_KEYDOWN ||
+            msg = WindowMessages.WM_SYSKEYDOWN
+        let isKeyUp =
+            msg = WindowMessages.WM_KEYUP ||
+            msg = WindowMessages.WM_SYSKEYUP ||
+            (data.flags &&& LlKeyboardHookFlags.LLKHF_UP) <> 0
+        let isAltDown = (data.flags &&& LlKeyboardHookFlags.LLKHF_ALTDOWN) <> 0
+
+        match this.vkToTabIndex(vkCode), this.foregroundGroup with
+        | Some(index), Some(group) when this.enableAltNumberHotKey && isKeyDown && isAltDown && isKeyUp.not ->
+            handledNumericTabKeys.Add(vkCode).ignore
+            let groupInfo = group.cast<GroupInfo>()
+            groupInfo.invokeGroup <| fun() ->
+                groupInfo.group.activateIndex(index, true)
+            true
+        | Some(_), _ when isKeyUp && handledNumericTabKeys.Remove(vkCode) ->
+            true
+        | _ ->
+            false
+
     member this.registerKeyboardLLHook() =
         kbHook <- OS.registerKeyboardLLHook <| fun(key, data) ->
-            this.foregroundGroup.iter <| fun group ->
-                let groupInfo = group.cast<GroupInfo>()
-                groupInfo.invokeGroup <| fun() ->
-                    groupInfo.group.postKeyboardLL(int(key), data)
-            None
+            if this.tryHandleNumericTabHotKey(key, data) then
+                Some(1)
+            else
+                this.foregroundGroup.iter <| fun group ->
+                    let groupInfo = group.cast<GroupInfo>()
+                    groupInfo.invokeGroup <| fun() ->
+                        groupInfo.group.postKeyboardLL(int(key), data)
+                None
 
     interface IPlugin with
         member x.init() =
diff --git a/WtProgram/GroupPlugins/NumericTabHotKeyPlugin.fs b/WtProgram/GroupPlugins/NumericTabHotKeyPlugin.fs
index 4be8ee2..fabb5a1 100755
--- a/WtProgram/GroupPlugins/NumericTabHotKeyPlugin.fs
+++ b/WtProgram/GroupPlugins/NumericTabHotKeyPlugin.fs
@@ -3,8 +3,6 @@ open System
 open System.Runtime.InteropServices
 
 type NumericTabHotKeyPlugin() as this =
-    let mutable ctrlKeyPressed = false
-
     member this.wtGroup = Services.get<WindowGroup>()
 
     member this.vkToTabIndex(msg) =
@@ -15,16 +13,16 @@ type NumericTabHotKeyPlugin() as this =
             None
 
     member this.onKeyboardLL(msg, data:KBDLLHOOKSTRUCT) =
-        let keyDown = 
-            if msg = WindowMessages.WM_KEYDOWN then Some(true)
-            else if msg = WindowMessages.WM_KEYUP then Some(false)
-            else None
-
         let vkCode = data.vkCode
-        keyDown.iter <| fun(keyDown) ->
-            if Win32Helper.IsKeyPressed(VirtualKeyCodes.VK_CONTROL) then
-                this.vkToTabIndex(vkCode).iter <| fun(index) ->
-                    this.wtGroup.activateIndex(index, true)
+        let isKeyDown =
+            msg = WindowMessages.WM_KEYDOWN ||
+            msg = WindowMessages.WM_SYSKEYDOWN
+        let isAltDown = (data.flags &&& LlKeyboardHookFlags.LLKHF_ALTDOWN) <> 0
+        let isKeyUp = (data.flags &&& LlKeyboardHookFlags.LLKHF_UP) <> 0
+
+        if isKeyDown && isAltDown && isKeyUp.not then
+            this.vkToTabIndex(vkCode).iter <| fun(index) ->
+                this.wtGroup.activateIndex(index, true)
 
     interface IPlugin with
         member x.init() =
diff --git a/WtProgram/ManagerViewService/Views/BehaviorView.fs b/WtProgram/ManagerViewService/Views/BehaviorView.fs
index bf754c9..21b6cca 100755
--- a/WtProgram/ManagerViewService/Views/BehaviorView.fs
+++ b/WtProgram/ManagerViewService/Views/BehaviorView.fs
@@ -95,7 +95,7 @@ type HotKeyView() =
             text, editor.control
 
         let fields = fields.prependList(List2([
-            ("enableCtrlNumberHotKey", settingsCheckbox "enableCtrlNumberHotKey")
+            ("enableAltNumberHotKey", settingsCheckbox "enableAltNumberHotKey")
             ("enableHoverActivate", settingsCheckbox "enableHoverActivate")
             ("enableShiftScroll", settingsCheckbox "enableShiftScroll")
         ]))
diff --git a/WtProgram/Properties/Resources.ja-JP.resx b/WtProgram/Properties/Resources.ja-JP.resx
index b944558..ad5fb26 100644
--- a/WtProgram/Properties/Resources.ja-JP.resx
+++ b/WtProgram/Properties/Resources.ja-JP.resx
@@ -162,8 +162,8 @@
   <data name="groupWindowsInSwitcher" xml:space="preserve">
     <value>タスク切替でウィンドウをグループ化する</value>
   </data>
-  <data name="enableCtrlNumberHotKey" xml:space="preserve">
-    <value>Ctrl+1、... Ctrl+9 でタブをアクティブ化を有効にする</value>
+  <data name="enableAltNumberHotKey" xml:space="preserve">
+    <value>Alt+1、... Alt+9 でタブをアクティブ化を有効にする</value>
   </data>
   <data name="enableHoverActivate" xml:space="preserve">
     <value>マウスホバーでタブを有効にする</value>
diff --git a/WtProgram/Properties/Resources.resx b/WtProgram/Properties/Resources.resx
index 031f59d..834b4e7 100644
--- a/WtProgram/Properties/Resources.resx
+++ b/WtProgram/Properties/Resources.resx
@@ -162,8 +162,8 @@
   <data name="groupWindowsInSwitcher" xml:space="preserve">
     <value>Group windows in WindowTabs task switcher</value>
   </data>
-  <data name="enableCtrlNumberHotKey" xml:space="preserve">
-    <value>Enable Ctrl+1, ...Ctrl+9 to activate tab</value>
+  <data name="enableAltNumberHotKey" xml:space="preserve">
+    <value>Enable Alt+1, ...Alt+9 to activate tab</value>
   </data>
   <data name="enableHoverActivate" xml:space="preserve">
     <value>Enable mouse hover to activate tab</value>
diff --git a/WtProgram/Settings.fs b/WtProgram/Settings.fs
index 91547aa..753e3c5 100755
--- a/WtProgram/Settings.fs
+++ b/WtProgram/Settings.fs
@@ -128,7 +128,7 @@ type Settings(isStandAlone) as this =
                         combineIconsInTaskbar = settingsJson.getBool("combineIconsInTaskbar").def(hasExistingSettings)
                         replaceAltTab = settingsJson.getBool("replaceAltTab").def(false)
                         groupWindowsInSwitcher = settingsJson.getBool("groupWindowsInSwitcher").def(false)
-                        enableCtrlNumberHotKey = settingsJson.getBool("enableCtrlNumberHotKey").def(true)
+                        enableAltNumberHotKey = settingsJson.getBool("enableAltNumberHotKey").def(true)
                         enableHoverActivate = settingsJson.getBool("enableHoverActivate").def(false)
                         autoHide = settingsJson.getBool("autoHide").def(true)
                         enableShiftScroll = settingsJson.getBool("enableShiftScroll").def(true)
@@ -175,7 +175,7 @@ type Settings(isStandAlone) as this =
             settingsJson.setBool("combineIconsInTaskbar", settings.combineIconsInTaskbar)
             settingsJson.setBool("replaceAltTab", settings.replaceAltTab)
             settingsJson.setBool("groupWindowsInSwitcher", settings.groupWindowsInSwitcher)
-            settingsJson.setBool("enableCtrlNumberHotKey", settings.enableCtrlNumberHotKey)
+            settingsJson.setBool("enableAltNumberHotKey", settings.enableAltNumberHotKey)
             settingsJson.setBool("enableHoverActivate", settings.enableHoverActivate)
             settingsJson.setBool("autoHide", settings.autoHide)
             settingsJson.setBool("enableShiftScroll", settings.enableShiftScroll)
diff --git a/WtProgram/Shared/ProgramTypes.fs b/WtProgram/Shared/ProgramTypes.fs
index 2f315ee..e7cbe4a 100755
--- a/WtProgram/Shared/ProgramTypes.fs
+++ b/WtProgram/Shared/ProgramTypes.fs
@@ -29,7 +29,7 @@ type SettingsRec = {
     enableTabbingByDefault: bool
     replaceAltTab: bool
     groupWindowsInSwitcher: bool
-    enableCtrlNumberHotKey: bool
+    enableAltNumberHotKey: bool
     combineIconsInTaskbar: bool
     enableHoverActivate: bool
     autoHide: bool