Improve/simplificate action center fix

stephtr · stephtr · commit 9de673c93a25 · 2019-06-16T21:31:40.000+02:00
diff --git a/FixSurfaceKeyboard/FixSurfaceKeyboard.cpp b/FixSurfaceKeyboard/FixSurfaceKeyboard.cpp
@@ -37,8 +37,6 @@ int main(int argc, char* argv[])
 		}
 	}
 
-	RegisterApplicationRestart(NULL, 0);
-
 	HWND hwnd = CreateWindow(L"STATIC", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
 
 	RAWINPUTDEVICE* rid = new RAWINPUTDEVICE[1];
diff --git a/FixSurfaceKeyboard/KeyboardUtils.h b/FixSurfaceKeyboard/KeyboardUtils.h
@@ -121,16 +121,10 @@ bool handleKey_SurfaceKeyboard(DWORD vk, int modifierState, bool keydown) {
 	// pressing the action center key results in Shift + Ctrl + Alt + Win + F21,
 	// which (obviously) doesn't open the action center.
 	static bool blockActionCenter = false;
-	if (keydown
-		&& vk == VK_F21 && modifierState == (PK_RSHIFT | PK_LCTRL | PK_RALT | PK_LWIN)
-		&& !blockActionCenter)
+	if (keydown && vk == VK_F21 && modifierState == (PK_RSHIFT | PK_LCTRL | PK_RALT | PK_LWIN))
 	{
 		ShellExecute(0, 0, L"ms-actioncenter:", 0, 0, SW_HIDE);
-		blockActionCenter = true;
-		return true;
 	}
-	if (!keydown && vk == VK_LWIN)
-		blockActionCenter = false;
 
 	return handleKey;
 }
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"><?define FixSurfaceKeyboard_TargetDir=$(var.FixSurfaceKeyboard.TargetDir)?>
-	<Product Id="*" Name="FixSurfaceKeyboard" Language="1033" Version="1.0.5.0" Manufacturer="Stephan Troyer" UpgradeCode="A4331800-4547-429D-B43B-EC66D61535F5">
+	<Product Id="*" Name="FixSurfaceKeyboard" Language="1033" Version="1.0.6.0" Manufacturer="Stephan Troyer" UpgradeCode="A4331800-4547-429D-B43B-EC66D61535F5">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" Manufacturer="Stephan Troyer" InstallPrivileges="elevated" />
     
     <Property Id='ARPURLINFOABOUT'>https://github.com/stephtr/FixSurfaceKeyboard</Property>

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ int main(int argc, char* argv[])`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- RegisterApplicationRestart(NULL, 0);`
`41`		`-`
`42`	`40`	`HWND hwnd = CreateWindow(L"STATIC", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);`
`43`	`41`
`44`	`42`	`RAWINPUTDEVICE* rid = new RAWINPUTDEVICE[1];`
Original file line number	Diff line number	Diff line change
`@@ -121,16 +121,10 @@ bool handleKey_SurfaceKeyboard(DWORD vk, int modifierState, bool keydown) {`
`121`	`121`	`// pressing the action center key results in Shift + Ctrl + Alt + Win + F21,`
`122`	`122`	`// which (obviously) doesn't open the action center.`
`123`	`123`	`static bool blockActionCenter = false;`
`124`		`- if (keydown`
`125`		`- && vk == VK_F21 && modifierState == (PK_RSHIFT \| PK_LCTRL \| PK_RALT \| PK_LWIN)`
`126`		`- && !blockActionCenter)`
	`124`	`+ if (keydown && vk == VK_F21 && modifierState == (PK_RSHIFT \| PK_LCTRL \| PK_RALT \| PK_LWIN))`
`127`	`125`	`{`
`128`	`126`	`ShellExecute(0, 0, L"ms-actioncenter:", 0, 0, SW_HIDE);`
`129`		`- blockActionCenter = true;`
`130`		`- return true;`
`131`	`127`	`}`
`132`		`- if (!keydown && vk == VK_LWIN)`
`133`		`- blockActionCenter = false;`
`134`	`128`
`135`	`129`	`return handleKey;`
`136`	`130`	`}`