SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Temporarily remove .NET Framework 4.0 from UI

Browse Source
This commit is contained in:
Matt Nadareski
2023-11-23 02:32:57 -05:00
parent b848a401f8
commit 872959c889
8 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -35,6 +35,7 @@
- Support .NET Framework 2.0
- Support .NET Framework 3.5 in UI.Core
- Get UI building with Framework 4.0
- Temporarily remove .NET Framework 4.0 from UI
### 3.0.0 (2023-11-14)

3
MPF.UI.Core/Windows/DiscInformationWindow.xaml.cs
View File

@@ -22,6 +22,8 @@ namespace MPF.UI.Core.Windows
/// </summary>
public DiscInformationWindow(Options options, SubmissionInfo? submissionInfo)
{
InitializeComponent();
#if NET452_OR_GREATER || NETCOREAPP
var chrome = new System.Windows.Shell.WindowChrome
{
@@ -31,7 +33,6 @@ namespace MPF.UI.Core.Windows
System.Windows.Shell.WindowChrome.SetWindowChrome(this, chrome);
#endif
InitializeComponent();
DataContext = new DiscInformationViewModel(options, submissionInfo);
DiscInformationViewModel.Load();

4
MPF.UI.Core/Windows/MainWindow.xaml.cs
View File

@@ -23,6 +23,8 @@ namespace MPF.UI.Core.Windows
/// </summary>
public MainWindow()
{
InitializeComponent();
#if NET452_OR_GREATER || NETCOREAPP
var chrome = new System.Windows.Shell.WindowChrome
{
@@ -31,8 +33,6 @@ namespace MPF.UI.Core.Windows
};
System.Windows.Shell.WindowChrome.SetWindowChrome(this, chrome);
#endif
InitializeComponent();
}
/// <summary>

4
MPF.UI.Core/Windows/OptionsWindow.xaml.cs
View File

@@ -24,6 +24,8 @@ namespace MPF.UI.Core.Windows
/// </summary>
public OptionsWindow(Options options)
{
InitializeComponent();
#if NET40_OR_GREATER || NETCOREAPP
DumpSpeedCDTextBox.IsReadOnlyCaretVisible = false;
DumpSpeedDVDTextBox.IsReadOnlyCaretVisible = false;
@@ -39,8 +41,6 @@ namespace MPF.UI.Core.Windows
};
System.Windows.Shell.WindowChrome.SetWindowChrome(this, chrome);
#endif
InitializeComponent();
DataContext = new OptionsViewModel(options);
// Set initial value for binding

4
MPF.UI.Core/Windows/RingCodeGuideWindow.xaml.cs
View File

@@ -7,6 +7,8 @@
{
public RingCodeGuideWindow()
{
InitializeComponent();
#if NET452_OR_GREATER || NETCOREAPP
var chrome = new System.Windows.Shell.WindowChrome
{
@@ -15,8 +17,6 @@
};
System.Windows.Shell.WindowChrome.SetWindowChrome(this, chrome);
#endif
InitializeComponent();
}
}
}

2
MPF/App.xaml
View File

@@ -219,6 +219,7 @@
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsGrouping" Value="true"/>
<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
</MultiTrigger.Conditions>
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</MultiTrigger>
@@ -263,6 +264,7 @@
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsGrouping" Value="true"/>
<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
</MultiTrigger.Conditions>
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</MultiTrigger>

13
MPF/App.xaml.cs
View File

@@ -24,7 +24,7 @@ namespace MPF
AddDropShadowChrome("ComboBoxTemplate");
AddDropShadowChrome("ComboBoxEditableTemplate");
#if NET452_OR_GREATER || NETCOREAPP
#if FALSE && (NET452_OR_GREATER || NETCOREAPP)
AddVirtualizingCondition("ComboBoxTemplate");
AddVirtualizingCondition("ComboBoxEditableTemplate");
#endif
@@ -207,12 +207,19 @@ namespace MPF
return;
// Set the virtualizing condition
var condition = new Condition
var isVirtualizing = new Condition
{
Property = VirtualizingPanel.IsVirtualizingWhenGroupingProperty,
Value = "false",
};
multiTrigger.Conditions.Add(condition);
var currentConditions = multiTrigger.Conditions.ToList();
multiTrigger.Conditions.Clear();
foreach (var condition in currentConditions)
{
multiTrigger.Conditions.Add(condition);
}
multiTrigger.Conditions.Add(isVirtualizing);
}
#endif

2
MPF/MPF.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<!-- Assembly Properties -->
<TargetFrameworks>net40;net452;net462;net472;net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net452;net462;net472;net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<OutputType>WinExe</OutputType>
<ApplicationIcon>Images\Icon.ico</ApplicationIcon>