Emulation/Mesen2
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen2.git synced 2025-04-02 10:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

UI: Update to Avalonia 11.1.1

Browse source
This commit is contained in:
Sour 2024-07-28 11:05:14 +09:00
parent 91e8f8ca9f
commit f3f44613a4
7 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI/Controls/PaletteConfig.axaml
View file

@ -33,7 +33,7 @@
Click="btnSelectPalette_OnClick"
>
<Button.ContextMenu>
<ContextMenu Name="Preset" PlacementMode="Bottom" ItemsSource="{Binding PalettePresets, ElementName=root}">
<ContextMenu Name="Preset" Placement="BottomEdgeAlignedLeft" ItemsSource="{Binding PalettePresets, ElementName=root}">
<ContextMenu.Styles>
<Style Selector="MenuItem">
<Setter Property="Header" Value="{Binding Name, DataType={x:Type c:PalettePreset}}" />

2
UI/Styles/AvaloniaMenuItemStyles.xaml
View file

@ -75,7 +75,7 @@
</Border>
<Popup Name="PART_Popup"
WindowManagerAddShadowHint="False"
PlacementMode="RightEdgeAlignedTop"
Placement="RightEdgeAlignedTop"
HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}"
IsLightDismissEnabled="False"
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">

21
UI/UI.csproj
View file

@ -89,11 +89,6 @@
<None Remove="Styles\StartupStyles.xaml" />
<None Remove="Utilities\DipSwitchDefinitions.xml" />
</ItemGroup>
<PropertyGroup>
<RestoreSources>
https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json
</RestoreSources>
</PropertyGroup>
<ItemGroup>
<TrimmerRootAssembly Include="Mesen" />
<TrimmerRootAssembly Include="AvaloniaEdit" />
@ -103,15 +98,15 @@
<TrimmerRootAssembly Include="Dock.Settings" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.999-cibuild0045373-beta" />
<PackageReference Include="Avalonia" Version="11.1.1" />
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0045373-beta" />
<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.999-cibuild0045373-beta" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0045373-beta" Condition="'$(OptimizeUi)'!='true'" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0045373-beta" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.999-cibuild0045373-beta" />
<PackageReference Include="Dock.Avalonia" Version="11.0.10" />
<PackageReference Include="Dock.Model.Mvvm" Version="11.0.10" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.1" />
<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.1.1" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.1.1" Condition="'$(OptimizeUi)'!='true'" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.1" />
<PackageReference Include="Dock.Avalonia" Version="11.1.0.1" />
<PackageReference Include="Dock.Model.Mvvm" Version="11.1.0.1" />
<PackageReference Include="Dotnet.Bundle" Version="*" />
<PackageReference Include="ELFSharp" Version="2.17.3" />
<PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />

2
UI/Views/GameboyConfigView.axaml
View file

@ -105,7 +105,7 @@
Click="btnSelectPreset_OnClick"
>
<Button.ContextMenu>
<ContextMenu PlacementMode="Bottom">
<ContextMenu Placement="BottomEdgeAlignedLeft">
<MenuItem Header="{l:Translate lblGrayscale}" Click="mnuGrayscalePreset_Click" />
<MenuItem Header="{l:Translate lblGrayscaleHighContrast}" Click="mnuGrayscaleHighContrastPreset_Click" />
<MenuItem Header="{l:Translate lblGreen}" Click="mnuGreenPreset_Click" />

2
UI/Views/VideoConfigView.axaml
View file

@ -116,7 +116,7 @@
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="1" VerticalAlignment="Top">
<Button Content="{l:Translate btnSelectPreset}" Click="btnPreset_OnClick">
<Button.ContextMenu>
<ContextMenu PlacementMode="Bottom">
<ContextMenu Placement="BottomEdgeAlignedLeft">
<MenuItem Header="{l:Translate mnuPresetComposite}" Command="{Binding PresetCompositeCommand}" />
<MenuItem Header="{l:Translate mnuPresetSVideo}" Command="{Binding PresetSVideoCommand}" />
<MenuItem Header="{l:Translate mnuPresetRgb}" Command="{Binding PresetRgbCommand}" />

2
UI/Windows/AboutWindow.axaml.cs
View file

@ -10,6 +10,7 @@ using Mesen.Interop;
using System.Collections.Generic;
using Avalonia.Input;
using Mesen.Utilities;
using System.Runtime.CompilerServices;
namespace Mesen.Windows
{
@ -26,6 +27,7 @@ namespace Mesen.Windows
Version = EmuApi.GetMesenVersion().ToString();
BuildDate = EmuApi.GetMesenBuildDate();
RuntimeVersion = ".NET " + Environment.Version;
RuntimeVersion += RuntimeFeature.IsDynamicCodeSupported ? " (JIT)" : " (AOT)";
LibraryList = new List<AboutListEntry>() {
new("Avalonia", "", "MIT", "https://github.com/AvaloniaUI/Avalonia"),

2
UI/Windows/ControllerConfigWindow.axaml
View file

@ -49,7 +49,7 @@
IsVisible="{Binding ShowPresets}"
>
<Button.ContextMenu>
<ContextMenu Name="Preset" PlacementMode="Bottom">
<ContextMenu Name="Preset" Placement="BottomEdgeAlignedLeft">
<MenuItem Header="{l:Translate mnuKeyboard}">
<MenuItem Header="{l:Translate mnuWasdLayout}" Click="mnuWasdLayout_OnClick" />
<MenuItem Header="{l:Translate mnuArrowLayout}" Click="mnuArrowLayout_OnClick" />