eu07/StarterNG
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/StarterNG.git synced 2026-11-02 12:49:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move to Avalonia 12.1.4

Browse Source 
12.1.3 stops drawing a stretched PathGeometry, which took the Discord icon, so
this goes one patch past the version Dependabot offered.

Three things follow from the new version. A combo box placeholder keeps its full
opacity. The consist strip's padding, ignored until now, is gone, as it would
take 4 px from the panels above. A scenery picked from code is brought into view.
This commit is contained in:
maj00r
2026-11-01 18:59:57 +01:00
parent 81c7e8ba95
commit 212e11278f
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
StarterNG/StarterNG.csproj
View File

@@ -24,10 +24,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="12.0.4" />
<PackageReference Include="Avalonia.Desktop" Version="12.0.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.0.4" />
<PackageReference Include="Avalonia" Version="12.1.4" />
<PackageReference Include="Avalonia.Desktop" Version="12.1.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.4" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.17">
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">none</IncludeAssets>

3
StarterNG/Styles/Carbon.axaml
View File

@@ -499,6 +499,9 @@
<Style Selector="TextBox:not(:disabled) /template/ TextBlock#PART_Placeholder">
<Setter Property="Opacity" Value="1" />
</Style>
<Style Selector="ComboBox:not(:disabled) /template/ TextBlock#PlaceholderTextBlock">
<Setter Property="Opacity" Value="1" />
</Style>
<Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
<Setter Property="BorderBrush" Value="{StaticResource CarbonAccentBright}" />

3
StarterNG/Views/Depot.axaml
View File

@@ -314,8 +314,7 @@
TextWrapping="Wrap" MaxWidth="520" Opacity="0.6" TextAlignment="Center"
Text="{Binding [ConsistEmpty], Source={x:Static starterNg:App.Loc}}" />
<ScrollViewer Name="consistScroll"
HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Disabled"
Padding="0,0,0,4">
HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Disabled">
<Panel>
<!-- Tab reaches the strip once and lands on the selected
card; the arrow keys walk it from there. -->

4
StarterNG/Views/Scenarios.axaml.cs
View File

@@ -14,6 +14,7 @@ using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Layout;
using Avalonia.Media.Imaging;
using Avalonia.Threading;
using Avalonia.VisualTree;
using StarterNG.Classes;
using StarterNG.Domain;
@@ -378,6 +379,9 @@ public partial class Scenarios : UserControl
}
Scenery selectedScn = Sceneries[tag];
// A scenery picked from code stays out of sight otherwise; after layout, as its group may have just opened.
Dispatcher.UIThread.Post(item.BringIntoView, DispatcherPriority.Loaded);
// The scenery is the one started from now on, whether or not it lists a
// consist: left as it was, a scenery with none - or none the filters show -
// started the one picked before.