Merge branch 'master'

CHANGELOG.md

@@ -12,6 +12,17 @@ Tested on OS build 22621.1555. Installer requires Internet connectivity.
 
 * Weather: Fixed a bug that prevented the widget from loading when using the Microsoft icon pack. (968d969)
 
+##### 2
+
+* Simple Window Switcher
+	* Support for individual list and grouping for UWP apps (implemented grouping and naming enhancements based on using information associated with `AppUserModelID`s)
+	* Ability to switch between global and local window lists when the switcher is shown.
+	* Maintain position in the list when certain events occur, like closing windows or switching between the global and local window lists.
+	* `Del` key closes the currently selected window(s).
+	* Fixed a bug that prevented newly spawned windows while the switcher is open from going to the back of the list.
+	* Fixed a bug that prevented window lists from building properly when windows were slow to close.
+	* Fixed a bug that prevented proper activation of pop-up windows under certain conditions. For example, the switcher is now able to correctly switch to the "Error Checking" window in This PC - right click C: - Properties - Tools - Error checking - Check.
+
 ## 22621.1413.54
 
 Tested on OS build 22621.1413.

ExplorerPatcher/GUI.c

@@ -3144,7 +3144,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                                 1,
                                 0
                             );
-                            //swprintf(text + 3, MAX_LINE_LENGTH, L"Disable per-application window list ( Alt + %c )", key);
+                            //swprintf(text + 3, MAX_LINE_LENGTH, L"Disable the interaction list for individual apps ( Alt + %c )", key);
                             swprintf(text + 11, MAX_LINE_LENGTH, L" ( Alt + %c )", key);
                         }
                         if (tabOrder == _this->tabOrder)

ExplorerPatcher/settings.reg

@@ -342,13 +342,13 @@
 "AltTabSettings"=dword:00000000
 ;s WindowSwitcher_SWS IsSWSEnabled
 [HKEY_CURRENT_USER\Software\ExplorerPatcher\sws]
-;b 包括桌面
+;b 将“桌面”窗口添加为列表最后一个
 "IncludeWallpaper"=dword:00000001
 ;b 始终显示在主显示器
 "PrimaryOnly"=dword:00000000
 ;b 仅显示当前显示器的窗口
 "PerMonitor"=dword:00000000
-;b 仅显示最近的窗口（各应用切换器）
+;b 将同一个应用的窗口分为一组
 "SwitcherIsPerApplication"=dword:00000000
 ;b 禁用应用窗口列表%PLACEHOLDER_0001%
 "NoPerApplicationList"=dword:00000000

ExplorerPatcher/settings10.reg

@@ -255,13 +255,13 @@
 "AltTabSettings"=dword:00000000
 ;t The following settings only apply to the Simple Window Switcher:
 [HKEY_CURRENT_USER\Software\ExplorerPatcher\sws]
-;b Include desktop
+;b Show the desktop as the last window in the interaction list
 "IncludeWallpaper"=dword:00000001
-;b Always show on primary monitor
+;b Always display switcher on primary monitor
 "PrimaryOnly"=dword:00000000
-;b Show windows only from current monitor
+;b Display windows only from the monitor containing the cursor
 "PerMonitor"=dword:00000000
-;b Display only the most recent window (per application switcher)
+;b Group windows of the same app
 "SwitcherIsPerApplication"=dword:00000000
 ;b %PLACEHOLDER_0001%
 "NoPerApplicationList"=dword:00000000

version.h

@@ -1,7 +1,7 @@
 #define VER_MAJOR 22621
 #define VER_MINOR 1555
 #define VER_BUILD_HI    55
-#define VER_BUILD_LO 1
+#define VER_BUILD_LO 2
 #define VER_FLAGS   VS_FF_PRERELEASE
 
 
@@ -12,5 +12,5 @@
 #define VER_STR(arg) #arg
 
 // The String form of the version numbers
-#define VER_FILE_STRING VALUE "FileVersion", "22621.1555.55.1"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.1555.55.1"
+#define VER_FILE_STRING VALUE "FileVersion", "22621.1555.55.2"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.1555.55.2"