diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs index 976b09f..791cc48 100644 --- a/Source/Installer/Product.wxs +++ b/Source/Installer/Product.wxs @@ -1,6 +1,6 @@  - - 1.1.31 + 1.1.39 - 7.12.0 + 8.0.2 5.0.0 diff --git a/Source/VisualStateTest/VisualStateTest.csproj b/Source/VisualStateTest/VisualStateTest.csproj index 1de537c..4035bdd 100644 --- a/Source/VisualStateTest/VisualStateTest.csproj +++ b/Source/VisualStateTest/VisualStateTest.csproj @@ -100,7 +100,7 @@ - 1.1.31 + 1.1.39 diff --git a/Source/Wifinian/AppController.cs b/Source/Wifinian/AppController.cs index 5d741f4..ee2a36b 100644 --- a/Source/Wifinian/AppController.cs +++ b/Source/Wifinian/AppController.cs @@ -221,7 +221,7 @@ private void OnMenuWindowShowRequested(object sender, Point e) private void ShowMainWindow() { var window = (MainWindow)_current.MainWindow; - if (window is { CanBeShown: false } or { Visibility: Visibility.Visible, IsForeground: true }) + if (window is null or { CanBeShown: false } or { Visibility: Visibility.Visible, IsForeground: true }) return; window.Show(); diff --git a/Source/Wifinian/Library/ScreenFrame.dll b/Source/Wifinian/Library/ScreenFrame.dll index 9e1c930..706d3f4 100644 Binary files a/Source/Wifinian/Library/ScreenFrame.dll and b/Source/Wifinian/Library/ScreenFrame.dll differ diff --git a/Source/Wifinian/Library/ScreenFrame.xml b/Source/Wifinian/Library/ScreenFrame.xml index f35877b..7d12b54 100644 --- a/Source/Wifinian/Library/ScreenFrame.xml +++ b/Source/Wifinian/Library/ScreenFrame.xml @@ -49,121 +49,86 @@ Whether OS is Windows 11 (10.0.22000) or greater - - - Mover of - - - - - Window to be moved - - - + - Per-Monitor DPI of window + Mover of which implements basic functions - + Constructor Window to be moved - - - Adjusts DPI of window. - - DPI information - - + - Handles window messages. + Alignment of pivot - + Handles window position changing event. - + Handles window position changed event. - - - Handles DPI changed event. - - - - - Handles display change event. - - - - - Occurs when the application to which the window belongs is activated. - - - - - Occurs when the application to which the window belongs is deactivated. - - - + - Handles application activated/deactivated event. + Handles Display change event. - + - Occurs when the escape key is pressed. + Gets Per-Monitor DPI of the monitor. + DPI information - + - Handles key pressed event. + Attempts to get the adjacent location using specified window width and height. + Window width + Window height + Location of window + True if successfully gets - + - Determines whether the window is foreground window. + Attempts to confirm that a specified location is not completely outside of monitors. - True if foreground + Location of window + True if successfully confirms + + The specified location and the current location are not necessarily in the same monitor. + - + - Mover of which implements basic functions + Mover of which implements functions for float window - + Constructor Window to be moved + Pivot point to be referred - + Alignment of pivot - + - Handles window position changing event. - - - - - Handles window position changed event. - - - - - Handles Display change event. + Gets Per-Monitor DPI of the monitor. + DPI information - + Attempts to get the adjacent location using specified window width and height. @@ -172,34 +137,44 @@ Location of window True if successfully gets - + - Attempts to confirm that a specified location is not completely outside of monitors. + Attempts to get the adjacent location to pivot point using specified window width and height. + Window width + Window height Location of window - True if successfully confirms - - The specified location and the current location are not necessarily in the same monitor. - + True if successfully gets - + - Mover of which implements functions for float window + Mover of which implements functions for popup window - + Constructor Window to be moved Pivot point to be referred - + Alignment of pivot - + + + Whether to make window centered at pivot + + + + + Gets Per-Monitor DPI of the monitor. + + DPI information + + Attempts to get the adjacent location using specified window width and height. @@ -208,7 +183,7 @@ Location of window True if successfully gets - + Attempts to get the adjacent location to pivot point using specified window width and height. @@ -323,6 +298,89 @@ Location of window True if successfully gets + + + Mover of + + + + + Window to be moved + + + + + Per-Monitor DPI of window + + + + + Constructor + + Window to be moved + + + + Adjusts DPI of window. + + DPI information + + + + Handles window messages. + + + + + Handles window position changing event. + + + + + Handles window position changed event. + + + + + Handles DPI changed event. + + + + + Handles display change event. + + + + + Occurs when the application to which the window belongs is activated. + + + + + Occurs when the application to which the window belongs is deactivated. + + + + + Handles application activated/deactivated event. + + + + + Occurs when the escape key is pressed. + + + + + Handles key pressed event. + + + + + Determines whether the window is foreground window. + + True if foreground + Windows themes information @@ -491,6 +549,17 @@ Protected implementation of Dispose pattern + + + Utility methods for cursor + + + + + Gets the current point of cursor. + + The point of cursor + Additional methods for @@ -701,6 +770,13 @@ System DPI + + + Gets Per-Monitor DPI of the monitor to which a specified point belongs. + + Point + DPI information + Gets Per-Monitor DPI of the monitor to which a specified Visual belongs. @@ -746,6 +822,11 @@ Descendant visual True if successfully gets + + + Utility methods for + + If no display monitor intersects, returns null. @@ -761,6 +842,38 @@ If no display monitor intersects, returns a handle to the display monitor that is nearest to the rectangle. + + + Attempts to get monitor rectangle which includes a specified point. + + Point to be checked + Monitor rectangle + Working area rectangle + True if successfully gets + + + + Attempts to get monitor rectangle which includes a specified rectangle. + + Rectangle to be checked + Monitor rectangle + Working area rectangle + True if successfully gets + + + + Determines if a specified window is foreground. + + Window to be determined + True if foreground + + + + Ensures a specified window is foreground. + + Window to be ensured + True if foreground + Attempts to get the information on primary taskbar. diff --git a/Source/Wifinian/Library/StartupAgency.dll b/Source/Wifinian/Library/StartupAgency.dll index 3ee7436..886b4ce 100644 Binary files a/Source/Wifinian/Library/StartupAgency.dll and b/Source/Wifinian/Library/StartupAgency.dll differ diff --git a/Source/Wifinian/Properties/AssemblyInfo.cs b/Source/Wifinian/Properties/AssemblyInfo.cs index 87c933a..3414b55 100644 --- a/Source/Wifinian/Properties/AssemblyInfo.cs +++ b/Source/Wifinian/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.1.0")] -[assembly: AssemblyFileVersion("3.0.1.0")] +[assembly: AssemblyVersion("3.1.0.0")] +[assembly: AssemblyFileVersion("3.1.0.0")] [assembly: Guid("056ef371-bf6b-42c3-82b7-a113cafa5718")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/Source/Wifinian/Wifinian.csproj b/Source/Wifinian/Wifinian.csproj index cab0cef..de8815b 100644 --- a/Source/Wifinian/Wifinian.csproj +++ b/Source/Wifinian/Wifinian.csproj @@ -1,219 +1,219 @@  - - - Debug - AnyCPU - {056EF371-BF6B-42C3-82B7-A113CAFA5718} - WinExe - Properties - Wifinian - Wifinian - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - app.manifest - - - Resources\Icons\AppIcon.ico - - - - - - - False - Library\ScreenFrame.dll - - - False - Library\StartupAgency.dll - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - True - True - Resources.resx - - - App.xaml - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MSBuild:Compile - Designer - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - MenuWindow.xaml - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - Code - - - Designer - - - - - - Designer - - - - - - - - - - - PreserveNewest - - - - - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - 2.1.0 - - - 1.1.31 - - - 7.12.0 - - - 5.0.0 - - - 5.0.0 - - - 5.0.0 - - - 5.0.0 - - - 5.0.0 - - - 5.0.0 - - - 4.5.0 - - - + + + Debug + AnyCPU + {056EF371-BF6B-42C3-82B7-A113CAFA5718} + WinExe + Properties + Wifinian + Wifinian + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + app.manifest + + + Resources\Icons\AppIcon.ico + + + + + + + False + Library\ScreenFrame.dll + + + False + Library\StartupAgency.dll + + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + True + True + Resources.resx + + + App.xaml + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MSBuild:Compile + Designer + + + MainWindow.xaml + Code + + + Designer + MSBuild:Compile + + + MenuWindow.xaml + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + Code + + + Designer + + + + + + Designer + + + + + + + + + + + PreserveNewest + + + + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + + + + 2.1.0 + + + 1.1.39 + + + 8.0.2 + + + 5.0.0 + + + 5.0.0 + + + 5.0.0 + + + 5.0.0 + + + 5.0.0 + + + 5.0.0 + + + 4.5.0 + + + \ No newline at end of file