mirror of
https://github.com/hawkeye-stan/msfs-popout-panel-manager.git
synced 2024-11-23 06:10:11 +00:00
Version 4.1.0 Release
This commit is contained in:
parent
29f616324e
commit
54c7f96e0f
15 changed files with 53 additions and 40 deletions
|
@ -11,9 +11,9 @@
|
|||
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
|
||||
<RootNamespace>MSFSPopoutPanelManager.DomainModel</RootNamespace>
|
||||
<Platforms>x64</Platforms>
|
||||
<Version>4.1.0.3</Version>
|
||||
<AssemblyVersion>4.1.0.3</AssemblyVersion>
|
||||
<FileVersion>4.1.0.3</FileVersion>
|
||||
<Version>4.1.0.4</Version>
|
||||
<AssemblyVersion>4.1.0.4</AssemblyVersion>
|
||||
<FileVersion>4.1.0.4</FileVersion>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<DebugType>Embedded</DebugType>
|
||||
<Configurations>Debug;Release;Local</Configurations>
|
||||
|
|
|
@ -216,7 +216,10 @@
|
|||
|
||||
|
||||
<!-- Panel configurations -->
|
||||
<StackPanel Width="440" VerticalAlignment="Center">
|
||||
<StackPanel
|
||||
Width="440"
|
||||
VerticalAlignment="Center"
|
||||
IsEnabled="{c:Binding 'DataItem.IsFloating'}">
|
||||
<StackPanel
|
||||
x:Name="StackPanelAdjustment"
|
||||
Width="440"
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
<RootNamespace>MSFSPopoutPanelManager.MainApp</RootNamespace>
|
||||
<ApplicationIcon>logo.ico</ApplicationIcon>
|
||||
<Platforms>x64</Platforms>
|
||||
<Version>4.1.0.3</Version>
|
||||
<AssemblyVersion>4.1.0.3</AssemblyVersion>
|
||||
<FileVersion>4.1.0.3</FileVersion>
|
||||
<Version>4.1.0.4</Version>
|
||||
<AssemblyVersion>4.1.0.4</AssemblyVersion>
|
||||
<FileVersion>4.1.0.4</FileVersion>
|
||||
<DebugType>embedded</DebugType>
|
||||
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
|
||||
<!-- Publishing options -->
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
using MSFSPopoutPanelManager.Shared;
|
||||
using MSFSPopoutPanelManager.WindowsAgent;
|
||||
|
||||
namespace MSFSPopoutPanelManager.Orchestration
|
||||
{
|
||||
|
@ -16,5 +17,16 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
protected AppSettingData AppSettingData => _sharedStorage.AppSettingData;
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
|
||||
public static void Attach(FlightSimData flightSimData, AppSettingData appSettingData)
|
||||
{
|
||||
if (appSettingData == null || !appSettingData.ApplicationSetting.DynamicLodSetting.IsEnabled || _isActive)
|
||||
if (appSettingData == null || _isActive)
|
||||
return;
|
||||
|
||||
_flightSimData = flightSimData;
|
||||
|
@ -76,7 +76,7 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
if (_appSettingData == null)
|
||||
return;
|
||||
|
||||
if (_appSettingData.ApplicationSetting.DynamicLodSetting.IsEnabled && _appSettingData.ApplicationSetting.DynamicLodSetting.ResetEnabled)
|
||||
if (_appSettingData.ApplicationSetting.DynamicLodSetting.ResetEnabled)
|
||||
{
|
||||
WriteTlod(_appSettingData.ApplicationSetting.DynamicLodSetting.ResetTlod);
|
||||
WriteOlod(_appSettingData.ApplicationSetting.DynamicLodSetting.ResetOlod);
|
||||
|
|
|
@ -40,7 +40,9 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
WindowProcessManager.GetSimulatorProcess(); // refresh simulator process
|
||||
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 += (_, _) =>
|
||||
|
@ -390,7 +392,9 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
|
||||
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)
|
||||
|
@ -398,14 +402,16 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
ProfileData.ResetActiveProfile();
|
||||
|
||||
OnFlightStopped?.Invoke(this, EventArgs.Empty);
|
||||
|
||||
WindowActionManager.CloseAllPopOuts();
|
||||
|
||||
CloseAllPopOuts();
|
||||
|
||||
FlightSimData.HudBarData?.Clear();
|
||||
|
||||
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()
|
||||
|
|
|
@ -139,7 +139,6 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
PreferenceConfigurationDetection,
|
||||
StartPopOutKeyboardShortcut,
|
||||
FloatingPanelDetection,
|
||||
FloatingPanel,
|
||||
|
||||
FloatingPanel
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,9 +11,9 @@
|
|||
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
|
||||
<RootNamespace>MSFSPopoutPanelManager.Orchestration</RootNamespace>
|
||||
<Platforms>x64</Platforms>
|
||||
<Version>4.1.0.3</Version>
|
||||
<AssemblyVersion>4.1.0.3</AssemblyVersion>
|
||||
<FileVersion>4.1.0.3</FileVersion>
|
||||
<Version>4.1.0.4</Version>
|
||||
<AssemblyVersion>4.1.0.4</AssemblyVersion>
|
||||
<FileVersion>4.1.0.4</FileVersion>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<DebugType>Embedded</DebugType>
|
||||
<Configurations>Debug;Release;Local</Configurations>
|
||||
|
|
|
@ -32,7 +32,7 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
|
||||
_keyboardOrchestrator.OnKeystrokeDetected += (_, e) =>
|
||||
{
|
||||
if (ActiveProfile == null)
|
||||
if (ProfileData == null || ActiveProfile == null)
|
||||
return;
|
||||
|
||||
var panel = ActiveProfile.PanelConfigs.FirstOrDefault(p => p.Id == e.PanelId);
|
||||
|
|
|
@ -95,8 +95,7 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
|
||||
public void ClosePopOut()
|
||||
{
|
||||
// Close all existing custom pop out panels
|
||||
WindowActionManager.CloseAllPopOuts();
|
||||
CloseAllPopOuts();
|
||||
|
||||
if (ActiveProfile != null)
|
||||
ActiveProfile.IsPoppedOut = false;
|
||||
|
@ -144,7 +143,7 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
ProfileData.ResetActiveProfile();
|
||||
|
||||
// Close all existing custom pop out panels
|
||||
WindowActionManager.CloseAllPopOuts();
|
||||
CloseAllPopOuts();
|
||||
|
||||
// Close all panel source overlays
|
||||
_panelSourceOrchestrator.CloseAllPanelSource();
|
||||
|
@ -262,14 +261,8 @@ namespace MSFSPopoutPanelManager.Orchestration
|
|||
|
||||
panelConfig.IsSelectedPanelSource = true;
|
||||
|
||||
//if(!AppSetting.GeneralSetting.TurboMode)
|
||||
// _panelSourceOrchestrator.ShowPanelSourceNonEdit(panelConfig);
|
||||
|
||||
if(panelConfig.PanelSource.X != null && panelConfig.PanelSource.Y != null)
|
||||
InputEmulationManager.PrepareToPopOutPanel((int)panelConfig.PanelSource.X, (int)panelConfig.PanelSource.Y, AppSetting.GeneralSetting.TurboMode);
|
||||
|
||||
//if(!AppSetting.GeneralSetting.TurboMode)
|
||||
// _panelSourceOrchestrator.ClosePanelSourceNonEdit(panelConfig);
|
||||
|
||||
ExecuteCustomPopout(panelConfig, builtInPanelHandles, index++);
|
||||
|
||||
|
|
|
@ -11,9 +11,9 @@
|
|||
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
|
||||
<RootNamespace>MSFSPopoutPanelManager.Shared</RootNamespace>
|
||||
<Platforms>x64</Platforms>
|
||||
<Version>4.1.0.3</Version>
|
||||
<AssemblyVersion>4.1.0.3</AssemblyVersion>
|
||||
<FileVersion>4.1.0.3</FileVersion>
|
||||
<Version>4.1.0.4</Version>
|
||||
<AssemblyVersion>4.1.0.4</AssemblyVersion>
|
||||
<FileVersion>4.1.0.4</FileVersion>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<DebugType>Embedded</DebugType>
|
||||
<Configurations>Debug;Release;Local</Configurations>
|
||||
|
|
|
@ -11,9 +11,9 @@
|
|||
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
|
||||
<RootNamespace>MSFSPopoutPanelManager.SimConnectAgent</RootNamespace>
|
||||
<Platforms>x64</Platforms>
|
||||
<Version>4.1.0.3</Version>
|
||||
<AssemblyVersion>4.1.0.3</AssemblyVersion>
|
||||
<FileVersion>4.1.0.3</FileVersion>
|
||||
<Version>4.1.0.4</Version>
|
||||
<AssemblyVersion>4.1.0.4</AssemblyVersion>
|
||||
<FileVersion>4.1.0.4</FileVersion>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<DebugType>Embedded</DebugType>
|
||||
<Configurations>Debug;Release;Local</Configurations>
|
||||
|
|
|
@ -55,7 +55,7 @@ namespace MSFSPopoutPanelManager.WindowsAgent
|
|||
|
||||
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
|
||||
PInvoke.SetCursorPos(x, y);
|
||||
|
|
|
@ -189,7 +189,7 @@ namespace MSFSPopoutPanelManager.WindowsAgent
|
|||
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;
|
||||
|
||||
panelConfig.Left = rect.Left;
|
||||
|
|
|
@ -11,9 +11,9 @@
|
|||
<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
|
||||
<RootNamespace>MSFSPopoutPanelManager.WindowsAgent</RootNamespace>
|
||||
<Platforms>x64</Platforms>
|
||||
<Version>4.1.0.3</Version>
|
||||
<AssemblyVersion>4.1.0.3</AssemblyVersion>
|
||||
<FileVersion>4.1.0.3</FileVersion>
|
||||
<Version>4.1.0.4</Version>
|
||||
<AssemblyVersion>4.1.0.4</AssemblyVersion>
|
||||
<FileVersion>4.1.0.4</FileVersion>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<DebugType>Embedded</DebugType>
|
||||
<Configurations>Debug;Release;Local</Configurations>
|
||||
|
|
Loading…
Reference in a new issue