修复
This commit is contained in:
1 parent
7de92a25f5
commit
0e86c17056
131 files changed
+1309
-907
No files matched your search
@@ -1,10 +1,13 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.Json;
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.Layout;
|
||||
using Avalonia.Media;
|
||||
using System.Collections.Generic;
|
||||
using EarthModelStudio.Models;
|
||||
using EarthModelStudio.Services;
|
||||
|
||||
@@ -18,6 +21,19 @@ namespace EarthModelStudio.Views;
|
||||
public sealed class PlayerWindow : Window
|
||||
{
|
||||
private LoadedModel? _model;
|
||||
private Button? _maximizeButton;
|
||||
private Border? _frame;
|
||||
private TextBlock? _titleText;
|
||||
private Border? _titleBar;
|
||||
private readonly List<Button> _titleButtons = new();
|
||||
private Button? _helpButton;
|
||||
/// <summary>基准尺寸(1240×820 时的标题栏高度与按钮尺寸)。</summary>
|
||||
private const double BaseWidth = 1240;
|
||||
private const double BaseTitleBarHeight = 34;
|
||||
private const double BaseButtonWidth = 38;
|
||||
private const double BaseButtonHeight = 28;
|
||||
private const double BaseTitleFont = 11.5;
|
||||
private const double BaseHelpFont = 11.5;
|
||||
|
||||
public PlayerWindow(ModelPackage package, LoadedModel model)
|
||||
{
|
||||
@@ -33,46 +49,114 @@ public sealed class PlayerWindow : Window
|
||||
// 与启动器一致:去掉系统标题栏,自己做一个极简顶栏(否则 Esc 之外无法关闭)
|
||||
SystemDecorations = Avalonia.Controls.SystemDecorations.None;
|
||||
|
||||
// 标题栏配色来自模型清单,跟随模型自己的界面风格:
|
||||
// 地球模型是深色舞台,比例尺计算器是浅色卡片,两者不能共用一套深色。
|
||||
var chrome = package.Manifest.Chrome;
|
||||
var barBg = ParseColor(chrome?.TitleBar, "#0C1828");
|
||||
var barBorder = ParseColor(chrome?.TitleBorder, "#1B2740");
|
||||
var barText = ParseColor(chrome?.TitleText, "#EAF2FF");
|
||||
var btnText = ParseColor(chrome?.Button, "#9FB4D4");
|
||||
var frameBg = ParseColor(chrome?.Frame, "#0A1524");
|
||||
|
||||
var titleText = new TextBlock
|
||||
{
|
||||
Text = package.LocalizedName,
|
||||
Foreground = new SolidColorBrush(barText),
|
||||
FontSize = 11.5,
|
||||
Margin = new Thickness(14, 0, 0, 0),
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
[Grid.ColumnProperty] = 0
|
||||
};
|
||||
_titleText = titleText;
|
||||
|
||||
var helpButton = new Button
|
||||
{
|
||||
Content = IsEnglish() ? "How to use?" : "如何使用?",
|
||||
Height = 26,
|
||||
Padding = new Thickness(12, 0),
|
||||
Background = Brushes.Transparent,
|
||||
Foreground = new SolidColorBrush(btnText),
|
||||
BorderThickness = new Thickness(0),
|
||||
FontSize = 11.5,
|
||||
CornerRadius = new CornerRadius(7),
|
||||
Margin = new Thickness(0, 0, 6, 0),
|
||||
HorizontalContentAlignment = HorizontalAlignment.Center,
|
||||
VerticalContentAlignment = VerticalAlignment.Center,
|
||||
Cursor = new Cursor(StandardCursorType.Hand),
|
||||
[Grid.ColumnProperty] = 1
|
||||
};
|
||||
helpButton.Click += (_, _) => ShowHelp(package, barBg, barBorder, barText, btnText, frameBg);
|
||||
|
||||
// 标题栏三键:最小化 / 最大化 / 关闭。配色与按钮尺寸都跟随模型 chrome。
|
||||
Button TitleButton(string glyph, int column, bool isClose = false)
|
||||
{
|
||||
var b = new Button
|
||||
{
|
||||
Content = glyph,
|
||||
Width = 38,
|
||||
Height = 28,
|
||||
Background = Brushes.Transparent,
|
||||
Foreground = new SolidColorBrush(btnText),
|
||||
BorderThickness = new Thickness(0),
|
||||
FontSize = 13,
|
||||
CornerRadius = new CornerRadius(7),
|
||||
Margin = new Thickness(2, 0, 0, 0),
|
||||
HorizontalContentAlignment = HorizontalAlignment.Center,
|
||||
VerticalContentAlignment = VerticalAlignment.Center,
|
||||
Cursor = new Cursor(StandardCursorType.Hand),
|
||||
[Grid.ColumnProperty] = column
|
||||
};
|
||||
// 悬停:深色标题栏用亮一点的同调色,浅色标题栏用浅灰,避免出现突兀的深色块
|
||||
var hover = isClose ? Color.Parse("#D64545")
|
||||
: IsLight(barBg) ? Color.Parse("#EDF2FC") : Color.Parse("#223252");
|
||||
var hoverText = isClose ? Colors.White
|
||||
: IsLight(barBg) ? (Color?)Color.Parse("#111A2E") : Colors.White;
|
||||
b.PointerEntered += (_, _) =>
|
||||
{
|
||||
b.Background = new SolidColorBrush(hover);
|
||||
if (hoverText.HasValue) b.Foreground = new SolidColorBrush(hoverText.Value);
|
||||
};
|
||||
b.PointerExited += (_, _) =>
|
||||
{
|
||||
b.Background = Brushes.Transparent;
|
||||
b.Foreground = new SolidColorBrush(btnText);
|
||||
};
|
||||
b.Classes.Add("model-titlebtn");
|
||||
return b;
|
||||
}
|
||||
|
||||
var minimizeButton = TitleButton("—", 2);
|
||||
var maximizeButton = TitleButton("□", 3);
|
||||
var closeButton = TitleButton("✕", 4, isClose: true);
|
||||
minimizeButton.Click += (_, _) => WindowState = WindowState.Minimized;
|
||||
maximizeButton.Click += (_, _) => ToggleMaximize();
|
||||
closeButton.Click += (_, _) => Close();
|
||||
|
||||
var titleBar = new Border
|
||||
{
|
||||
Height = 34,
|
||||
Background = new SolidColorBrush(Color.Parse("#0A1120")),
|
||||
Background = new SolidColorBrush(barBg),
|
||||
BorderBrush = new SolidColorBrush(barBorder),
|
||||
BorderThickness = new Thickness(0, 0, 0, 1),
|
||||
Child = new Grid
|
||||
{
|
||||
ColumnDefinitions = new ColumnDefinitions("*,Auto"),
|
||||
Children =
|
||||
{
|
||||
new TextBlock
|
||||
{
|
||||
Text = package.LocalizedName,
|
||||
Foreground = new SolidColorBrush(Color.Parse("#A9B8D4")),
|
||||
FontSize = 11.5,
|
||||
Margin = new Thickness(14, 0, 0, 0),
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
[Grid.ColumnProperty] = 0
|
||||
},
|
||||
new Button
|
||||
{
|
||||
Content = "✕",
|
||||
Width = 40,
|
||||
Height = 28,
|
||||
Background = Brushes.Transparent,
|
||||
Foreground = new SolidColorBrush(Color.Parse("#A9B8D4")),
|
||||
BorderThickness = new Thickness(0),
|
||||
FontSize = 13,
|
||||
CornerRadius = new CornerRadius(7),
|
||||
Margin = new Thickness(0, 0, 8, 0),
|
||||
HorizontalContentAlignment = HorizontalAlignment.Center,
|
||||
VerticalContentAlignment = VerticalAlignment.Center,
|
||||
[Grid.ColumnProperty] = 1
|
||||
}
|
||||
}
|
||||
ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto,Auto,Auto"),
|
||||
Children = { titleText, helpButton, minimizeButton, maximizeButton, closeButton }
|
||||
}
|
||||
};
|
||||
titleBar.PointerPressed += OnTitleBarPointerPressed;
|
||||
if (titleBar.Child is Grid g)
|
||||
foreach (var child in g.Children)
|
||||
if (child is Button b) b.Click += (_, _) => Close();
|
||||
// 双击标题栏 = 最大化 / 还原(与系统标题栏一致)
|
||||
titleBar.DoubleTapped += (_, e) =>
|
||||
{
|
||||
if (e.Source is Button) return;
|
||||
ToggleMaximize();
|
||||
};
|
||||
_maximizeButton = maximizeButton;
|
||||
_titleBar = titleBar;
|
||||
_helpButton = helpButton;
|
||||
_titleButtons.Add(minimizeButton);
|
||||
_titleButtons.Add(maximizeButton);
|
||||
_titleButtons.Add(closeButton);
|
||||
|
||||
var dock = new DockPanel { LastChildFill = true };
|
||||
DockPanel.SetDock(titleBar, Dock.Top);
|
||||
@@ -82,15 +166,255 @@ public sealed class PlayerWindow : Window
|
||||
Content = new Border
|
||||
{
|
||||
CornerRadius = new CornerRadius(16),
|
||||
Background = new SolidColorBrush(Color.Parse("#05070F")),
|
||||
Background = new SolidColorBrush(frameBg),
|
||||
ClipToBounds = true,
|
||||
Child = dock
|
||||
};
|
||||
_frame = (Border)Content;
|
||||
|
||||
// 最大化 / 还原时同步圆角与按钮图标
|
||||
PropertyChanged += (_, e) =>
|
||||
{
|
||||
if (e.Property == WindowStateProperty) UpdateMaximizeVisual();
|
||||
};
|
||||
|
||||
// 窗口随心拉大 / 拉小时,标题栏文字与按钮同比缩放。
|
||||
// 同时监听 Bounds 属性(不只是 SizeChanged),保证最大化/还原也立刻生效。
|
||||
SizeChanged += (_, _) => ApplyChromeScale();
|
||||
PropertyChanged += (_, e) =>
|
||||
{
|
||||
if (e.Property == BoundsProperty) ApplyChromeScale();
|
||||
};
|
||||
ApplyChromeScale();
|
||||
|
||||
KeyDown += OnKeyDown;
|
||||
Closed += OnClosed;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 让标题栏的文字与按钮尺寸跟随窗口大小。
|
||||
/// 以 1240px 宽为基准线性缩放,限制在 0.85–1.9 倍,
|
||||
/// 避免最大化到 4K 时按钮大得离谱、缩到最小又点不中。
|
||||
/// </summary>
|
||||
private void ApplyChromeScale()
|
||||
{
|
||||
if (Bounds.Width < 100) return;
|
||||
var scale = Math.Clamp(Bounds.Width / BaseWidth, 0.85, 1.9);
|
||||
|
||||
if (_titleBar != null) _titleBar.Height = Math.Round(BaseTitleBarHeight * scale);
|
||||
foreach (var b in _titleButtons)
|
||||
{
|
||||
b.Width = Math.Round(BaseButtonWidth * scale);
|
||||
b.Height = Math.Round(BaseButtonHeight * scale);
|
||||
b.FontSize = Math.Round(13 * scale, 1);
|
||||
b.CornerRadius = new CornerRadius(Math.Round(7 * scale, 1));
|
||||
}
|
||||
if (_helpButton != null)
|
||||
{
|
||||
_helpButton.Height = Math.Round(26 * scale);
|
||||
_helpButton.FontSize = Math.Round(BaseHelpFont * scale, 1);
|
||||
_helpButton.Padding = new Thickness(Math.Round(12 * scale), 0);
|
||||
_helpButton.CornerRadius = new CornerRadius(Math.Round(7 * scale, 1));
|
||||
}
|
||||
if (_titleText != null)
|
||||
{
|
||||
_titleText.FontSize = Math.Round(BaseTitleFont * scale, 1);
|
||||
_titleText.Margin = new Thickness(Math.Round(14 * scale), 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>判断颜色是否属于浅色系(用于决定悬停用深色还是浅色)。</summary>
|
||||
private static bool IsLight(Color c)
|
||||
{
|
||||
// 相对亮度(sRGB 近似)
|
||||
var lum = (0.299 * c.R + 0.587 * c.G + 0.114 * c.B) / 255.0;
|
||||
return lum > 0.6;
|
||||
}
|
||||
|
||||
private void ToggleMaximize()
|
||||
{
|
||||
WindowState = WindowState == WindowState.Maximized
|
||||
? WindowState.Normal
|
||||
: WindowState.Maximized;
|
||||
}
|
||||
|
||||
private void UpdateMaximizeVisual()
|
||||
{
|
||||
var max = WindowState == WindowState.Maximized || WindowState == WindowState.FullScreen;
|
||||
if (_maximizeButton != null)
|
||||
{
|
||||
// ❐ 还原 / □ 最大化
|
||||
_maximizeButton.Content = max ? "❐" : "□";
|
||||
Avalonia.Controls.ToolTip.SetTip(_maximizeButton, max
|
||||
? (IsEnglish() ? "Restore" : "还原")
|
||||
: (IsEnglish() ? "Maximize" : "最大化"));
|
||||
}
|
||||
// 最大化时贴边,不需要圆角;还原后恢复 16
|
||||
if (_frame != null) _frame.CornerRadius = new CornerRadius(max ? 0 : 16);
|
||||
}
|
||||
|
||||
private static Color ParseColor(string? hex, string fallback)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(hex))
|
||||
{
|
||||
try { return Color.Parse(hex!); }
|
||||
catch { /* 模型写错颜色时退回默认 */ }
|
||||
}
|
||||
return Color.Parse(fallback);
|
||||
}
|
||||
|
||||
private static bool IsEnglish() => L.I.Language.StartsWith("en", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
/// <summary>
|
||||
/// 「如何使用?」:读取模型自带数据目录里的 help.json(中英双语),
|
||||
/// 用与标题栏一致的配色弹出一个独立小窗。说明内容完全由模型提供,启动器不内置文案。
|
||||
/// </summary>
|
||||
private void ShowHelp(ModelPackage package, Color barBg, Color barBorder, Color barText,
|
||||
Color btnText, Color frameBg)
|
||||
{
|
||||
var lang = IsEnglish() ? "en" : "zh-CN";
|
||||
var file = Path.Combine(package.DataDirectory, "help.json");
|
||||
string title = IsEnglish() ? "How to use" : "如何使用";
|
||||
// 分节内容:每节一个标题 + 若干条说明;兼容旧的扁平 lines 格式
|
||||
var sections = new List<(string Heading, List<string> Lines)>();
|
||||
|
||||
if (File.Exists(file))
|
||||
{
|
||||
try
|
||||
{
|
||||
using var doc = JsonDocument.Parse(File.ReadAllText(file));
|
||||
var root = doc.RootElement;
|
||||
var node = root.TryGetProperty(lang, out var exact) ? exact
|
||||
: root.TryGetProperty("zh-CN", out var zh) ? zh : root;
|
||||
if (node.TryGetProperty("title", out var t)) title = t.GetString() ?? title;
|
||||
|
||||
if (node.TryGetProperty("sections", out var arr) && arr.ValueKind == JsonValueKind.Array)
|
||||
{
|
||||
foreach (var sec in arr.EnumerateArray())
|
||||
{
|
||||
var heading = sec.TryGetProperty("h", out var h) ? h.GetString() ?? "" : "";
|
||||
var items = new List<string>();
|
||||
if (sec.TryGetProperty("lines", out var ls) && ls.ValueKind == JsonValueKind.Array)
|
||||
foreach (var item in ls.EnumerateArray())
|
||||
if (item.ValueKind == JsonValueKind.String) items.Add(item.GetString() ?? "");
|
||||
if (items.Count > 0) sections.Add((heading, items));
|
||||
}
|
||||
}
|
||||
else if (node.TryGetProperty("lines", out var flat) && flat.ValueKind == JsonValueKind.Array)
|
||||
{
|
||||
var items = new List<string>();
|
||||
foreach (var item in flat.EnumerateArray())
|
||||
if (item.ValueKind == JsonValueKind.String) items.Add(item.GetString() ?? "");
|
||||
if (items.Count > 0) sections.Add(("", items));
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"读取模型帮助失败 {file}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
if (sections.Count == 0)
|
||||
sections.Add(("", new List<string>
|
||||
{
|
||||
IsEnglish() ? "This model has no usage notes yet." : "该模型暂未提供使用说明。"
|
||||
}));
|
||||
|
||||
var body = new StackPanel { Spacing = 6 };
|
||||
foreach (var (heading, items) in sections)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(heading))
|
||||
body.Children.Add(new TextBlock
|
||||
{
|
||||
Text = heading,
|
||||
Foreground = new SolidColorBrush(barText),
|
||||
FontSize = 13.5,
|
||||
FontWeight = FontWeight.SemiBold,
|
||||
Margin = new Thickness(0, 12, 0, 2)
|
||||
});
|
||||
foreach (var line in items)
|
||||
body.Children.Add(new TextBlock
|
||||
{
|
||||
Text = "• " + line,
|
||||
Foreground = new SolidColorBrush(btnText),
|
||||
FontSize = 12.5,
|
||||
TextWrapping = TextWrapping.Wrap,
|
||||
LineHeight = 19
|
||||
});
|
||||
}
|
||||
|
||||
var ok = new Button
|
||||
{
|
||||
Content = IsEnglish() ? "Got it" : "知道了",
|
||||
HorizontalAlignment = HorizontalAlignment.Right,
|
||||
Padding = new Thickness(18, 7),
|
||||
Margin = new Thickness(0, 14, 0, 0),
|
||||
Background = new SolidColorBrush(barBorder),
|
||||
Foreground = new SolidColorBrush(barText),
|
||||
BorderThickness = new Thickness(0),
|
||||
CornerRadius = new CornerRadius(8),
|
||||
Cursor = new Cursor(StandardCursorType.Hand)
|
||||
};
|
||||
|
||||
// 标题固定在顶部,正文滚动;内容再长也不会被裁掉
|
||||
var rootPanel = new DockPanel { LastChildFill = true };
|
||||
var header = new Border
|
||||
{
|
||||
Padding = new Thickness(24, 18, 24, 10),
|
||||
Child = new StackPanel
|
||||
{
|
||||
Spacing = 8,
|
||||
Children =
|
||||
{
|
||||
new TextBlock
|
||||
{
|
||||
Text = title,
|
||||
Foreground = new SolidColorBrush(barText),
|
||||
FontSize = 17,
|
||||
FontWeight = FontWeight.SemiBold
|
||||
},
|
||||
new Border { Height = 1, Background = new SolidColorBrush(barBorder) }
|
||||
}
|
||||
}
|
||||
};
|
||||
DockPanel.SetDock(header, Dock.Top);
|
||||
rootPanel.Children.Add(header);
|
||||
var scroll = new ScrollViewer
|
||||
{
|
||||
Content = new StackPanel
|
||||
{
|
||||
Margin = new Thickness(24, 0, 24, 8),
|
||||
Children = { body, ok }
|
||||
},
|
||||
VerticalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Auto,
|
||||
HorizontalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled
|
||||
};
|
||||
rootPanel.Children.Add(scroll);
|
||||
|
||||
var win = new Window
|
||||
{
|
||||
Title = title,
|
||||
Width = 660,
|
||||
Height = Math.Min(720, 240 + sections.Sum(s => s.Lines.Count * 24 + 40)),
|
||||
MinWidth = 480,
|
||||
MinHeight = 300,
|
||||
Background = Brushes.Transparent,
|
||||
TransparencyLevelHint = new[] { WindowTransparencyLevel.Transparent },
|
||||
SystemDecorations = SystemDecorations.None,
|
||||
WindowStartupLocation = WindowStartupLocation.CenterOwner,
|
||||
Content = new Border
|
||||
{
|
||||
CornerRadius = new CornerRadius(16),
|
||||
Background = new SolidColorBrush(frameBg),
|
||||
BorderBrush = new SolidColorBrush(barBorder),
|
||||
BorderThickness = new Thickness(1),
|
||||
ClipToBounds = true,
|
||||
Child = rootPanel
|
||||
}
|
||||
};
|
||||
ok.Click += (_, _) => win.Close();
|
||||
win.Show(this);
|
||||
}
|
||||
|
||||
private void OnTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
|
||||
{
|
||||
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
|
||||
|
||||
Reference in new issue
Block a user