diff --git a/ArduinoAgent/ArduinoAgent.csproj b/ArduinoAgent/ArduinoAgent.csproj index b60e669..4b712e1 100644 --- a/ArduinoAgent/ArduinoAgent.csproj +++ b/ArduinoAgent/ArduinoAgent.csproj @@ -10,9 +10,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.ArduinoAgent x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/Orchestration/Orchestration.csproj b/Orchestration/Orchestration.csproj index f5bb39d..2f49042 100644 --- a/Orchestration/Orchestration.csproj +++ b/Orchestration/Orchestration.csproj @@ -10,9 +10,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.Orchestration x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/Orchestration/PanelAnalyzer.cs b/Orchestration/PanelAnalyzer.cs index 1860c0b..afc29a1 100644 --- a/Orchestration/PanelAnalyzer.cs +++ b/Orchestration/PanelAnalyzer.cs @@ -28,10 +28,10 @@ namespace MSFSPopoutPanelManager.Orchestration var panelsStartingLeft = GetPanelMenubarStartingLeft(sourceImage, rectangle, panelMenubarTop + 5); - // The center of magnifying glass icon is around (2.8 x height of menubar) to the right of the panel menubar starting left + // The center of magnifying glass icon is around (2.7 x height of menubar) to the right of the panel menubar starting left // But need to use higher number here to click the left side of magnifying glass icon because on some panel, the ratio is smaller var menubarHeight = panelMenubarBottom - panelMenubarTop; - var magnifyingIconXCoor = panelsStartingLeft - Convert.ToInt32(menubarHeight * 2.8); // ToDo: play around with this multiplier to find the best for all resolutions + var magnifyingIconXCoor = panelsStartingLeft - Convert.ToInt32(menubarHeight * 2.7); // ToDo: play around with this multiplier to find the best for all resolutions var magnifyingIconYCoor = panelMenubarTop + Convert.ToInt32(menubarHeight / 2.2); return new Point(magnifyingIconXCoor, magnifyingIconYCoor); @@ -80,14 +80,13 @@ namespace MSFSPopoutPanelManager.Orchestration // Get a snippet of 1 pixel wide vertical strip of windows. We will choose the strip left of center. // This is to determine when the actual panel's vertical pixel starts in the window. This will allow accurate sizing of the template image var left = Convert.ToInt32((rectangle.Width) * 0.70); // look at around 70% from the left - var top = sourceImage.Height - rectangle.Height; - if (top < 0 || left < 0) + if (left < 0) return -1; unsafe { - var stripData = sourceImage.LockBits(new Rectangle(left, top, 1, rectangle.Height), ImageLockMode.ReadWrite, sourceImage.PixelFormat); + var stripData = sourceImage.LockBits(new Rectangle(left, 0, 1, rectangle.Height), ImageLockMode.ReadWrite, sourceImage.PixelFormat); int bytesPerPixel = Bitmap.GetPixelFormatSize(stripData.PixelFormat) / 8; int heightInPixels = stripData.Height; @@ -106,7 +105,7 @@ namespace MSFSPopoutPanelManager.Orchestration if (red == 255 && green == 255 && blue == 255) { sourceImage.UnlockBits(stripData); - return y + top; + return y; } } } diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index fd5dae5..82c8e83 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.Shared x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/SimconnectAgent/SimconnectAgent.csproj b/SimconnectAgent/SimconnectAgent.csproj index 37e5933..9e6c47e 100644 --- a/SimconnectAgent/SimconnectAgent.csproj +++ b/SimconnectAgent/SimconnectAgent.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.SimConnectAgent x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/TouchPanelAgent/TouchPanelAgent.csproj b/TouchPanelAgent/TouchPanelAgent.csproj index 9ab27bf..0958967 100644 --- a/TouchPanelAgent/TouchPanelAgent.csproj +++ b/TouchPanelAgent/TouchPanelAgent.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.TouchPanelAgent x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/UserDataAgent/UserDataAgent.csproj b/UserDataAgent/UserDataAgent.csproj index d856481..e8c0db7 100644 --- a/UserDataAgent/UserDataAgent.csproj +++ b/UserDataAgent/UserDataAgent.csproj @@ -10,9 +10,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.UserDataAgent x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/WebServer/WebServer.csproj b/WebServer/WebServer.csproj index a5d31c9..1628f27 100644 --- a/WebServer/WebServer.csproj +++ b/WebServer/WebServer.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.WebServer x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/WindowsAgent/WindowsAgent.csproj b/WindowsAgent/WindowsAgent.csproj index b7e2765..4688974 100644 --- a/WindowsAgent/WindowsAgent.csproj +++ b/WindowsAgent/WindowsAgent.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.WindowsAgent x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 Embedded Debug;Release;DebugTouchPanel;ReleaseTouchPanel diff --git a/WpfApp/WpfApp.csproj b/WpfApp/WpfApp.csproj index e693b54..9cd28da 100644 --- a/WpfApp/WpfApp.csproj +++ b/WpfApp/WpfApp.csproj @@ -14,9 +14,9 @@ MSFSPopoutPanelManager.WpfApp logo.ico x64 - 3.4.3.0911 - 3.4.3.0911 - 3.4.3.0911 + 3.4.4.0923 + 3.4.4.0923 + 3.4.4.0923 win-x64 embedded en