From 212e11278fcc2fbe586a8a4d96f0e79f5f196d2e Mon Sep 17 00:00:00 2001
From: maj00r <maj00r@host>
Date: Sun, 1 Nov 2026 18:59:57 +0100
Subject: [PATCH] Move to Avalonia 12.1.4

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.
---
 StarterNG/StarterNG.csproj         | 8 ++++----
 StarterNG/Styles/Carbon.axaml      | 3 +++
 StarterNG/Views/Depot.axaml        | 3 +--
 StarterNG/Views/Scenarios.axaml.cs | 4 ++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/StarterNG/StarterNG.csproj b/StarterNG/StarterNG.csproj
index d6184ec..c24c230 100644
--- a/StarterNG/StarterNG.csproj
+++ b/StarterNG/StarterNG.csproj
@@ -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>
diff --git a/StarterNG/Styles/Carbon.axaml b/StarterNG/Styles/Carbon.axaml
index 736d216..cf9e6a6 100644
--- a/StarterNG/Styles/Carbon.axaml
+++ b/StarterNG/Styles/Carbon.axaml
@@ -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}" />
diff --git a/StarterNG/Views/Depot.axaml b/StarterNG/Views/Depot.axaml
index ea8afe1..09625f8 100644
--- a/StarterNG/Views/Depot.axaml
+++ b/StarterNG/Views/Depot.axaml
@@ -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. -->
diff --git a/StarterNG/Views/Scenarios.axaml.cs b/StarterNG/Views/Scenarios.axaml.cs
index 08e942c..a37801f 100644
--- a/StarterNG/Views/Scenarios.axaml.cs
+++ b/StarterNG/Views/Scenarios.axaml.cs
@@ -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.