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

Add several copies from a vehicle's menu in the consist too

Browse Source 
The copies go right after the vehicle, a whole unit for one of a set. The
count flyout is shared with the browser.
This commit is contained in:
maj00r
2026-10-04 14:30:53 +02:00
parent 6232930f4c
commit 925ac87129
4 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
StarterNG/Views/Depot.axaml.cs
View File

@@ -81,7 +81,10 @@ public partial class Depot : UserControl
_consist, () => _browser.Selected, InsertTextureAt, _browser.SelectInBrowser);
_cards = new VehicleCards(consistStack, _db, _consist, _cargo, _minis, _hand,
RebuildConsist, () => _details.Refresh(), _browser.SelectInBrowser, _drag.ArmCardDrag);
RebuildConsist, () => _details.Refresh(), _browser.SelectInBrowser, _drag.ArmCardDrag)
{
AddCopies = AddCopiesAfter
};
// Hidden still scrolls - it only drops the bar itself.
MiniTextures.Sharp(miniPreview);
@@ -594,6 +597,16 @@ public partial class Depot : UserControl
InsertTexturesAt(texture, at, count);
}
/// <summary>Copies of the vehicle on a card - a whole unit for one of a set - right after it.</summary>
private void AddCopiesAfter(ConsistItem item, int count)
{
int index = _consist.IndexOf(item);
if (index < 0 || item.Cars.Count == 0 || _db.TextureForSkin(item.Cars[0].SkinFile) is not { } texture)
return;
InsertTexturesAt(texture, index + 1, count);
}
private void InsertTextureAt(VehicleTexture texture, int at) => InsertTexturesAt(texture, at, 1);
/// <summary>The vehicle count times in a row from at - each staffed as added - and one redraw.</summary>

47
StarterNG/Views/Depot/AddManyFlyout.cs Normal file
View File

@@ -0,0 +1,47 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Layout;
using Avalonia.Media;
namespace StarterNG.Views;
/// <summary>Asks how many times to add a vehicle, for the browser and the consist alike.</summary>
internal static class AddManyFlyout
{
public const int Max = 100;
public static void Show(Control anchor, PlacementMode placement, Action<int> add)
{
var count = new NumericUpDown
{
Minimum = 1, Maximum = Max, Increment = 1, FormatString = "0", Value = 2, MinWidth = 120
};
var confirm = new Button { Content = App.Loc["AddVehicle"], HorizontalAlignment = HorizontalAlignment.Right };
confirm.Classes.Add("Flat");
confirm.Classes.Add("Accent");
var panel = new StackPanel { Spacing = 6, Margin = new Thickness(8), MinWidth = 160 };
panel.Children.Add(new TextBlock { Text = App.Loc["AddManyCount"], FontWeight = FontWeight.Bold, FontSize = 12 });
panel.Children.Add(count);
panel.Children.Add(confirm);
var flyout = new Flyout { Content = panel, Placement = placement };
void Commit()
{
flyout.Hide();
add(Math.Clamp((int)(count.Value ?? 1), 1, Max));
}
confirm.Click += (_, _) => Commit();
count.KeyDown += (_, e) =>
{
if (e.Key != Key.Enter) return;
e.Handled = true;
Commit();
};
flyout.ShowAt(anchor);
count.Focus();
}
}

37
StarterNG/Views/Depot/VehicleBrowser.cs
View File

@@ -54,8 +54,6 @@ public sealed class VehicleBrowser
/// <summary>Adds the vehicle to the consist the given number of times.</summary>
public Action<VehicleTexture, int>? AddMany { get; set; }
private const int MaxAddMany = 100;
private bool _suppress;
private bool _syncingCombos;
@@ -363,38 +361,6 @@ public sealed class VehicleBrowser
}
}
private void ShowAddManyFlyout(Control anchor, VehicleTexture texture)
{
var count = new NumericUpDown
{
Minimum = 1, Maximum = MaxAddMany, Increment = 1, FormatString = "0", Value = 2, MinWidth = 120
};
var add = new Button { Content = App.Loc["AddVehicle"], HorizontalAlignment = HorizontalAlignment.Right };
add.Classes.Add("Flat");
add.Classes.Add("Accent");
var panel = new StackPanel { Spacing = 6, Margin = new Thickness(8), MinWidth = 160 };
panel.Children.Add(new TextBlock { Text = App.Loc["AddManyCount"], FontWeight = FontWeight.Bold, FontSize = 12 });
panel.Children.Add(count);
panel.Children.Add(add);
var flyout = new Flyout { Content = panel, Placement = PlacementMode.Right };
void Commit()
{
flyout.Hide();
AddMany?.Invoke(texture, Math.Clamp((int)(count.Value ?? 1), 1, MaxAddMany));
}
add.Click += (_, _) => Commit();
count.KeyDown += (_, e) =>
{
if (e.Key != Key.Enter) return;
e.Handled = true;
Commit();
};
flyout.ShowAt(anchor);
count.Focus();
}
private void List_OnContextRequested(object? sender, ContextRequestedEventArgs e)
{
var hit = e.Source as Control;
@@ -413,7 +379,8 @@ public sealed class VehicleBrowser
var menu = new ContextMenu();
var addMany = new MenuItem { Header = App.Loc["AddMany"], IsEnabled = AddMany is not null };
addMany.Click += (_, _) => ShowAddManyFlyout(anchor, texture);
addMany.Click += (_, _) =>
AddManyFlyout.Show(anchor, PlacementMode.Right, count => AddMany?.Invoke(texture, count));
menu.Items.Add(addMany);
menu.Items.Add(new Separator());

9
StarterNG/Views/Depot/VehicleCards.cs
View File

@@ -33,6 +33,9 @@ public sealed class VehicleCards
private readonly List<(Border Frame, ConsistItem Item, Dynamic Car)> _memberChrome = new();
/// <summary>Puts copies of the vehicle on a card right after it, the given number of times.</summary>
public Action<ConsistItem, int>? AddCopies { get; set; }
private readonly List<(Button Badge, ConsistItem Item)> _driverChrome = new();
public Dynamic? PressedCar { get; set; }
@@ -588,6 +591,12 @@ public sealed class VehicleCards
{
menu.Items.Clear();
var addMany = new MenuItem { Header = App.Loc["AddMany"], IsEnabled = AddCopies is not null };
addMany.Click += (_, _) =>
AddManyFlyout.Show(anchor, PlacementMode.Top, count => AddCopies?.Invoke(item, count));
menu.Items.Add(addMany);
menu.Items.Add(new Separator());
var num = new MenuItem { Header = App.Loc["WagonNumber"] };
num.Click += (_, _) => ShowWagonNumberFlyout(anchor, item.Cars[0]);
menu.Items.Add(num);