c-l/msfs-popout-panel-manager
1
0
Fork 0
mirror of https://github.com/hawkeye-stan/msfs-popout-panel-manager.git synced 2024-11-23 22:30:09 +00:00
Code Releases Activity

Version 4.1.0 Release

Browse source
This commit is contained in:
hawkeye 2024-03-12 09:14:17 -04:00
parent 29f616324e
commit 54c7f96e0f
15 changed files with 53 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DomainModel/DomainModel.csproj
View file

@ -11,9 +11,9 @@
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl> <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
<RootNamespace>MSFSPopoutPanelManager.DomainModel</RootNamespace> <RootNamespace>MSFSPopoutPanelManager.DomainModel</RootNamespace>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<Version>4.1.0.3</Version> <Version>4.1.0.4</Version>
<AssemblyVersion>4.1.0.3</AssemblyVersion> <AssemblyVersion>4.1.0.4</AssemblyVersion>
<FileVersion>4.1.0.3</FileVersion> <FileVersion>4.1.0.4</FileVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<DebugType>Embedded</DebugType> <DebugType>Embedded</DebugType>
<Configurations>Debug;Release;Local</Configurations> <Configurations>Debug;Release;Local</Configurations>

5
MainApp/AppUserControl/PopOutPanelConfigCard.xaml
View file

@ -216,7 +216,10 @@
<!-- Panel configurations --> <!-- Panel configurations -->
<StackPanel Width="440" VerticalAlignment="Center"> <StackPanel
Width="440"
VerticalAlignment="Center"
IsEnabled="{c:Binding 'DataItem.IsFloating'}">
<StackPanel <StackPanel
x:Name="StackPanelAdjustment" x:Name="StackPanelAdjustment"
Width="440" Width="440"

6
MainApp/MainApp.csproj
View file

@ -14,9 +14,9 @@
<RootNamespace>MSFSPopoutPanelManager.MainApp</RootNamespace> <RootNamespace>MSFSPopoutPanelManager.MainApp</RootNamespace>
<ApplicationIcon>logo.ico</ApplicationIcon> <ApplicationIcon>logo.ico</ApplicationIcon>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<Version>4.1.0.3</Version> <Version>4.1.0.4</Version>
<AssemblyVersion>4.1.0.3</AssemblyVersion> <AssemblyVersion>4.1.0.4</AssemblyVersion>
<FileVersion>4.1.0.3</FileVersion> <FileVersion>4.1.0.4</FileVersion>
<DebugType>embedded</DebugType> <DebugType>embedded</DebugType>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages> <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<!-- Publishing options --> <!-- Publishing options -->

12
Orchestration/BaseOrchestrator.cs
View file

@ -1,4 +1,5 @@
using MSFSPopoutPanelManager.Shared; using MSFSPopoutPanelManager.Shared;
using MSFSPopoutPanelManager.WindowsAgent;
namespace MSFSPopoutPanelManager.Orchestration namespace MSFSPopoutPanelManager.Orchestration
{ {
@ -16,5 +17,16 @@ namespace MSFSPopoutPanelManager.Orchestration
protected AppSettingData AppSettingData => _sharedStorage.AppSettingData; protected AppSettingData AppSettingData => _sharedStorage.AppSettingData;
protected FlightSimData FlightSimData => _sharedStorage.FlightSimData; protected FlightSimData FlightSimData => _sharedStorage.FlightSimData;
protected void CloseAllPopOuts()
{
foreach (var panelConfig in ProfileData.ActiveProfile.PanelConfigs)
{
if (panelConfig.FloatingPanel.IsEnabled && !panelConfig.IsFloating)
panelConfig.IsFloating = true;
}
WindowActionManager.CloseAllPopOuts();
}
} }
} }

4
Orchestration/DynamicLodManager.cs
View file

@ -40,7 +40,7 @@ namespace MSFSPopoutPanelManager.Orchestration
public static void Attach(FlightSimData flightSimData, AppSettingData appSettingData) public static void Attach(FlightSimData flightSimData, AppSettingData appSettingData)
{ {
if (appSettingData == null || !appSettingData.ApplicationSetting.DynamicLodSetting.IsEnabled || _isActive) if (appSettingData == null || _isActive)
return; return;
_flightSimData = flightSimData; _flightSimData = flightSimData;
@ -76,7 +76,7 @@ namespace MSFSPopoutPanelManager.Orchestration
if (_appSettingData == null) if (_appSettingData == null)
return; return;
if (_appSettingData.ApplicationSetting.DynamicLodSetting.IsEnabled && _appSettingData.ApplicationSetting.DynamicLodSetting.ResetEnabled) if (_appSettingData.ApplicationSetting.DynamicLodSetting.ResetEnabled)
{ {
WriteTlod(_appSettingData.ApplicationSetting.DynamicLodSetting.ResetTlod); WriteTlod(_appSettingData.ApplicationSetting.DynamicLodSetting.ResetTlod);
WriteOlod(_appSettingData.ApplicationSetting.DynamicLodSetting.ResetOlod); WriteOlod(_appSettingData.ApplicationSetting.DynamicLodSetting.ResetOlod);

14
Orchestration/FlightSimOrchestrator.cs
View file

@ -40,7 +40,9 @@ namespace MSFSPopoutPanelManager.Orchestration
WindowProcessManager.GetSimulatorProcess(); // refresh simulator process WindowProcessManager.GetSimulatorProcess(); // refresh simulator process
DetectMsfsExit(); DetectMsfsExit();
DynamicLodManager.Attach(FlightSimData, AppSettingData); // Attach in memory override for Dynamic LOD // Attach in memory override for Dynamic LOD
if (AppSettingData != null && AppSettingData.ApplicationSetting.DynamicLodSetting.IsEnabled)
DynamicLodManager.Attach(FlightSimData, AppSettingData);
}; };
_simConnectProvider.OnDisconnected += (_, _) => _simConnectProvider.OnDisconnected += (_, _) =>
@ -390,7 +392,9 @@ namespace MSFSPopoutPanelManager.Orchestration
FlightSimData.IsFlightStarted = true; FlightSimData.IsFlightStarted = true;
DynamicLodManager.Attach(FlightSimData, AppSettingData); // Attach in memory override for Dynamic LOD // Attach in memory override for Dynamic LOD
if (AppSettingData != null && AppSettingData.ApplicationSetting.DynamicLodSetting.IsEnabled)
DynamicLodManager.Attach(FlightSimData, AppSettingData);
} }
private void HandleOnFlightStopped(object sender, EventArgs e) private void HandleOnFlightStopped(object sender, EventArgs e)
@ -399,13 +403,15 @@ namespace MSFSPopoutPanelManager.Orchestration
OnFlightStopped?.Invoke(this, EventArgs.Empty); OnFlightStopped?.Invoke(this, EventArgs.Empty);
WindowActionManager.CloseAllPopOuts(); CloseAllPopOuts();
FlightSimData.HudBarData?.Clear(); FlightSimData.HudBarData?.Clear();
FlightSimData.IsFlightStarted = false; FlightSimData.IsFlightStarted = false;
DynamicLodManager.Detach(); // Detach in memory override for Dynamic LOD // Detach in memory override for Dynamic LOD
if (AppSettingData != null && AppSettingData.ApplicationSetting.DynamicLodSetting.IsEnabled)
DynamicLodManager.Detach();
} }
private void DetectMsfsExit() private void DetectMsfsExit()

3
Orchestration/KeyboardOrchestrator.cs
View file

@ -139,7 +139,6 @@ namespace MSFSPopoutPanelManager.Orchestration
PreferenceConfigurationDetection, PreferenceConfigurationDetection,
StartPopOutKeyboardShortcut, StartPopOutKeyboardShortcut,
FloatingPanelDetection, FloatingPanelDetection,
FloatingPanel, FloatingPanel
} }
} }

6
Orchestration/Orchestration.csproj
View file

@ -11,9 +11,9 @@
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl> <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
<RootNamespace>MSFSPopoutPanelManager.Orchestration</RootNamespace> <RootNamespace>MSFSPopoutPanelManager.Orchestration</RootNamespace>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<Version>4.1.0.3</Version> <Version>4.1.0.4</Version>
<AssemblyVersion>4.1.0.3</AssemblyVersion> <AssemblyVersion>4.1.0.4</AssemblyVersion>
<FileVersion>4.1.0.3</FileVersion> <FileVersion>4.1.0.4</FileVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<DebugType>Embedded</DebugType> <DebugType>Embedded</DebugType>
<Configurations>Debug;Release;Local</Configurations> <Configurations>Debug;Release;Local</Configurations>

2
Orchestration/PanelConfigurationOrchestrator.cs
View file

@ -32,7 +32,7 @@ namespace MSFSPopoutPanelManager.Orchestration
_keyboardOrchestrator.OnKeystrokeDetected += (_, e) => _keyboardOrchestrator.OnKeystrokeDetected += (_, e) =>
{ {
if (ActiveProfile == null) if (ProfileData == null || ActiveProfile == null)
return; return;
var panel = ActiveProfile.PanelConfigs.FirstOrDefault(p => p.Id == e.PanelId); var panel = ActiveProfile.PanelConfigs.FirstOrDefault(p => p.Id == e.PanelId);

11
Orchestration/PanelPopOutOrchestrator.cs
View file

@ -95,8 +95,7 @@ namespace MSFSPopoutPanelManager.Orchestration
public void ClosePopOut() public void ClosePopOut()
{ {
// Close all existing custom pop out panels CloseAllPopOuts();
WindowActionManager.CloseAllPopOuts();
if (ActiveProfile != null) if (ActiveProfile != null)
ActiveProfile.IsPoppedOut = false; ActiveProfile.IsPoppedOut = false;
@ -144,7 +143,7 @@ namespace MSFSPopoutPanelManager.Orchestration
ProfileData.ResetActiveProfile(); ProfileData.ResetActiveProfile();
// Close all existing custom pop out panels // Close all existing custom pop out panels
WindowActionManager.CloseAllPopOuts(); CloseAllPopOuts();
// Close all panel source overlays // Close all panel source overlays
_panelSourceOrchestrator.CloseAllPanelSource(); _panelSourceOrchestrator.CloseAllPanelSource();
@ -262,15 +261,9 @@ namespace MSFSPopoutPanelManager.Orchestration
panelConfig.IsSelectedPanelSource = true; panelConfig.IsSelectedPanelSource = true;
//if(!AppSetting.GeneralSetting.TurboMode)
// _panelSourceOrchestrator.ShowPanelSourceNonEdit(panelConfig);
if(panelConfig.PanelSource.X != null && panelConfig.PanelSource.Y != null) if(panelConfig.PanelSource.X != null && panelConfig.PanelSource.Y != null)
InputEmulationManager.PrepareToPopOutPanel((int)panelConfig.PanelSource.X, (int)panelConfig.PanelSource.Y, AppSetting.GeneralSetting.TurboMode); InputEmulationManager.PrepareToPopOutPanel((int)panelConfig.PanelSource.X, (int)panelConfig.PanelSource.Y, AppSetting.GeneralSetting.TurboMode);
//if(!AppSetting.GeneralSetting.TurboMode)
// _panelSourceOrchestrator.ClosePanelSourceNonEdit(panelConfig);
ExecuteCustomPopout(panelConfig, builtInPanelHandles, index++); ExecuteCustomPopout(panelConfig, builtInPanelHandles, index++);
ApplyPanelLocation(panelConfig); ApplyPanelLocation(panelConfig);

6
Shared/Shared.csproj
View file

@ -11,9 +11,9 @@
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl> <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
<RootNamespace>MSFSPopoutPanelManager.Shared</RootNamespace> <RootNamespace>MSFSPopoutPanelManager.Shared</RootNamespace>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<Version>4.1.0.3</Version> <Version>4.1.0.4</Version>
<AssemblyVersion>4.1.0.3</AssemblyVersion> <AssemblyVersion>4.1.0.4</AssemblyVersion>
<FileVersion>4.1.0.3</FileVersion> <FileVersion>4.1.0.4</FileVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<DebugType>Embedded</DebugType> <DebugType>Embedded</DebugType>
<Configurations>Debug;Release;Local</Configurations> <Configurations>Debug;Release;Local</Configurations>

6
SimconnectAgent/SimconnectAgent.csproj
View file

@ -11,9 +11,9 @@
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl> <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
<RootNamespace>MSFSPopoutPanelManager.SimConnectAgent</RootNamespace> <RootNamespace>MSFSPopoutPanelManager.SimConnectAgent</RootNamespace>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<Version>4.1.0.3</Version> <Version>4.1.0.4</Version>
<AssemblyVersion>4.1.0.3</AssemblyVersion> <AssemblyVersion>4.1.0.4</AssemblyVersion>
<FileVersion>4.1.0.3</FileVersion> <FileVersion>4.1.0.4</FileVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<DebugType>Embedded</DebugType> <DebugType>Embedded</DebugType>
<Configurations>Debug;Release;Local</Configurations> <Configurations>Debug;Release;Local</Configurations>

2
WindowsAgent/InputEmulationManager.cs
View file

@ -55,7 +55,7 @@ namespace MSFSPopoutPanelManager.WindowsAgent
MoveAppWindowFromLeftClickPoint(x, y); MoveAppWindowFromLeftClickPoint(x, y);
LeftClick(x + 30, y); // Left click outside the circle area to focus game window LeftClick(x, y); // Left click outside the circle area to focus game window
// Force cursor reset and focus // Force cursor reset and focus
PInvoke.SetCursorPos(x, y); PInvoke.SetCursorPos(x, y);

2
WindowsAgent/WindowEventManager.cs
View file

@ -189,7 +189,7 @@ namespace MSFSPopoutPanelManager.WindowsAgent
return; return;
} }
if (panelConfig.FloatingPanel.IsEnabled && panelConfig.IsFloating) // do not update coordinate if floating panel if (panelConfig.FloatingPanel.IsEnabled && !panelConfig.IsFloating) // do not update coordinate if floating panel
return; return;
panelConfig.Left = rect.Left; panelConfig.Left = rect.Left;

6
WindowsAgent/WindowsAgent.csproj
View file

@ -11,9 +11,9 @@
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl> <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
<RootNamespace>MSFSPopoutPanelManager.WindowsAgent</RootNamespace> <RootNamespace>MSFSPopoutPanelManager.WindowsAgent</RootNamespace>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<Version>4.1.0.3</Version> <Version>4.1.0.4</Version>
<AssemblyVersion>4.1.0.3</AssemblyVersion> <AssemblyVersion>4.1.0.4</AssemblyVersion>
<FileVersion>4.1.0.3</FileVersion> <FileVersion>4.1.0.4</FileVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<DebugType>Embedded</DebugType> <DebugType>Embedded</DebugType>
<Configurations>Debug;Release;Local</Configurations> <Configurations>Debug;Release;Local</Configurations>