修复
This commit is contained in:
1 parent
0e86c17056
commit
0f19921dd4
40 files changed
+177
-86
No files matched your search
Binary file not shown.
Binary file not shown.
@@ -13,7 +13,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+7de92a25f5b91dfe2b85dcd95639fdcc353badf2")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+0e86c17056e384fb4781e834170635823c62658e")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("VersionStamp")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("VersionStamp")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
25ae86342f7aef96f55d822e4132919c7d8a2fcbeeecb4d340860a96977bc7a0
|
c81ffee46c812d6870088243f5821019a5d9a372646039ffc929c12677f7c650
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
-1
@@ -14,7 +14,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")]
|
[assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+7de92a25f5b91dfe2b85dcd95639fdcc353badf2")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+0e86c17056e384fb4781e834170635823c62658e")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
333d391e56b5f8ac1b45ed85b7e0835410214f510c5f7dbd262998bc4f766e86
|
fa6c51c8e773d50cf657015f51ae4a5c8b23b568715c02f35621af7bebeb9c5f
|
||||||
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
-1
@@ -14,7 +14,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
|
||||||
[assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")]
|
[assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+7de92a25f5b91dfe2b85dcd95639fdcc353badf2")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+0e86c17056e384fb4781e834170635823c62658e")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
6c7c97c3f02eeffc76d4879c61550f9a465c23d5767074c56b7ae34e38adcbd9
|
30f34292527c63b098f51e7cefbc7867ef1a4577e58e83174c251a056735b209
|
||||||
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -17,8 +17,8 @@
|
|||||||
"atlas"
|
"atlas"
|
||||||
],
|
],
|
||||||
"dataDir": "earth-geography.model",
|
"dataDir": "earth-geography.model",
|
||||||
"version": "1.6",
|
"version": "1.7",
|
||||||
"updatedAt": "2026-11-12T11:29:46Z",
|
"updatedAt": "2026-11-12T11:34:37Z",
|
||||||
"chrome": {
|
"chrome": {
|
||||||
"titleBar": "#0C1828",
|
"titleBar": "#0C1828",
|
||||||
"titleBorder": "#1B2740",
|
"titleBorder": "#1B2740",
|
||||||
@@ -26,5 +26,5 @@
|
|||||||
"button": "#9FB4D4",
|
"button": "#9FB4D4",
|
||||||
"frame": "#0A1524"
|
"frame": "#0A1524"
|
||||||
},
|
},
|
||||||
"build": "c568a1b05e"
|
"build": "4720687a18"
|
||||||
}
|
}
|
||||||
@@ -23,8 +23,8 @@
|
|||||||
"type": "NeoRF.EarthModels.RevolutionModelFactory",
|
"type": "NeoRF.EarthModels.RevolutionModelFactory",
|
||||||
"preview": "preview.png",
|
"preview": "preview.png",
|
||||||
"apiVersion": 1,
|
"apiVersion": 1,
|
||||||
"version": "1.4",
|
"version": "1.5",
|
||||||
"updatedAt": "2026-11-12T11:29:46Z",
|
"updatedAt": "2026-11-12T11:34:37Z",
|
||||||
"chrome": {
|
"chrome": {
|
||||||
"titleBar": "#0C1828",
|
"titleBar": "#0C1828",
|
||||||
"titleBorder": "#1B2740",
|
"titleBorder": "#1B2740",
|
||||||
@@ -32,5 +32,5 @@
|
|||||||
"button": "#9FB4D4",
|
"button": "#9FB4D4",
|
||||||
"frame": "#0A1524"
|
"frame": "#0A1524"
|
||||||
},
|
},
|
||||||
"build": "41a6e0ead8"
|
"build": "fdc1b059c5"
|
||||||
}
|
}
|
||||||
@@ -23,8 +23,8 @@
|
|||||||
"type": "NeoRF.EarthModels.RotationModelFactory",
|
"type": "NeoRF.EarthModels.RotationModelFactory",
|
||||||
"preview": "preview.png",
|
"preview": "preview.png",
|
||||||
"apiVersion": 1,
|
"apiVersion": 1,
|
||||||
"version": "1.4",
|
"version": "1.5",
|
||||||
"updatedAt": "2026-11-12T11:29:46Z",
|
"updatedAt": "2026-11-12T11:34:37Z",
|
||||||
"chrome": {
|
"chrome": {
|
||||||
"titleBar": "#0C1828",
|
"titleBar": "#0C1828",
|
||||||
"titleBorder": "#1B2740",
|
"titleBorder": "#1B2740",
|
||||||
@@ -32,5 +32,5 @@
|
|||||||
"button": "#9FB4D4",
|
"button": "#9FB4D4",
|
||||||
"frame": "#0A1524"
|
"frame": "#0A1524"
|
||||||
},
|
},
|
||||||
"build": "5544dcea30"
|
"build": "f98f989f79"
|
||||||
}
|
}
|
||||||
@@ -24,8 +24,8 @@
|
|||||||
"type": "NeoRF.ScaleCalculator.ScaleCalculatorFactory",
|
"type": "NeoRF.ScaleCalculator.ScaleCalculatorFactory",
|
||||||
"preview": "preview.png",
|
"preview": "preview.png",
|
||||||
"apiVersion": 1,
|
"apiVersion": 1,
|
||||||
"version": "1.3",
|
"version": "1.4",
|
||||||
"updatedAt": "2026-11-12T11:29:46Z",
|
"updatedAt": "2026-11-12T11:34:37Z",
|
||||||
"chrome": {
|
"chrome": {
|
||||||
"titleBar": "#FFFFFF",
|
"titleBar": "#FFFFFF",
|
||||||
"titleBorder": "#E3E8F3",
|
"titleBorder": "#E3E8F3",
|
||||||
@@ -33,5 +33,5 @@
|
|||||||
"button": "#5B6A86",
|
"button": "#5B6A86",
|
||||||
"frame": "#F4F6FB"
|
"frame": "#F4F6FB"
|
||||||
},
|
},
|
||||||
"build": "f6418437d4"
|
"build": "47ba2697da"
|
||||||
}
|
}
|
||||||
+10
-10
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"schema": 1,
|
"schema": 1,
|
||||||
"generated": "2026-11-12T11:29:46Z",
|
"generated": "2026-11-12T11:34:37Z",
|
||||||
"repository": "https://gitcode.com/2509_92447106/GC",
|
"repository": "https://gitcode.com/2509_92447106/GC",
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"modelDir": "model",
|
"modelDir": "model",
|
||||||
"launcher": {
|
"launcher": {
|
||||||
"version": "1.0.4",
|
"version": "1.0.4",
|
||||||
"revision": "f43354e248",
|
"revision": "2480674708",
|
||||||
"packages": {
|
"packages": {
|
||||||
"win-x64": {
|
"win-x64": {
|
||||||
"path": "dist/GC-win-x64.zip",
|
"path": "dist/GC-win-x64.zip",
|
||||||
@@ -33,26 +33,26 @@
|
|||||||
"models": [
|
"models": [
|
||||||
{
|
{
|
||||||
"id": "earth-geography",
|
"id": "earth-geography",
|
||||||
"version": "1.6",
|
"version": "1.7",
|
||||||
"build": "c568a1b05e",
|
"build": "4720687a18",
|
||||||
"dir": "model/earth-geography"
|
"dir": "model/earth-geography"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "earth-revolution",
|
"id": "earth-revolution",
|
||||||
"version": "1.4",
|
"version": "1.5",
|
||||||
"build": "41a6e0ead8",
|
"build": "fdc1b059c5",
|
||||||
"dir": "model/earth-revolution"
|
"dir": "model/earth-revolution"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "earth-rotation",
|
"id": "earth-rotation",
|
||||||
"version": "1.4",
|
"version": "1.5",
|
||||||
"build": "5544dcea30",
|
"build": "f98f989f79",
|
||||||
"dir": "model/earth-rotation"
|
"dir": "model/earth-rotation"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "scale-calculator",
|
"id": "scale-calculator",
|
||||||
"version": "1.3",
|
"version": "1.4",
|
||||||
"build": "f6418437d4",
|
"build": "47ba2697da",
|
||||||
"dir": "model/scale-calculator"
|
"dir": "model/scale-calculator"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ using Avalonia.Controls;
|
|||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
using Avalonia.Layout;
|
using Avalonia.Layout;
|
||||||
using Avalonia.Media;
|
using Avalonia.Media;
|
||||||
|
using Avalonia.VisualTree;
|
||||||
using EarthModelStudio.Models;
|
using EarthModelStudio.Models;
|
||||||
using EarthModelStudio.Services;
|
using EarthModelStudio.Services;
|
||||||
|
|
||||||
@@ -26,6 +27,9 @@ public sealed class PlayerWindow : Window
|
|||||||
private TextBlock? _titleText;
|
private TextBlock? _titleText;
|
||||||
private Border? _titleBar;
|
private Border? _titleBar;
|
||||||
private readonly List<Button> _titleButtons = new();
|
private readonly List<Button> _titleButtons = new();
|
||||||
|
private readonly List<Avalonia.Controls.Shapes.Path> _titleGlyphs = new();
|
||||||
|
private Avalonia.Controls.Shapes.Path? _maximizeGlyph;
|
||||||
|
private Avalonia.Controls.Shapes.Path? _restoreGlyph;
|
||||||
private Button? _helpButton;
|
private Button? _helpButton;
|
||||||
/// <summary>基准尺寸(1240×820 时的标题栏高度与按钮尺寸)。</summary>
|
/// <summary>基准尺寸(1240×820 时的标题栏高度与按钮尺寸)。</summary>
|
||||||
private const double BaseWidth = 1240;
|
private const double BaseWidth = 1240;
|
||||||
@@ -87,19 +91,19 @@ public sealed class PlayerWindow : Window
|
|||||||
};
|
};
|
||||||
helpButton.Click += (_, _) => ShowHelp(package, barBg, barBorder, barText, btnText, frameBg);
|
helpButton.Click += (_, _) => ShowHelp(package, barBg, barBorder, barText, btnText, frameBg);
|
||||||
|
|
||||||
// 标题栏三键:最小化 / 最大化 / 关闭。配色与按钮尺寸都跟随模型 chrome。
|
// 标题栏三键:最小化 / 最大化 / 关闭。
|
||||||
Button TitleButton(string glyph, int column, bool isClose = false)
|
// 图标用矢量 Path 画(不用字体符号),线宽与圆角严格对齐,视觉上才干净。
|
||||||
|
Button TitleButton(int column, bool isClose = false)
|
||||||
{
|
{
|
||||||
var b = new Button
|
var b = new Button
|
||||||
{
|
{
|
||||||
Content = glyph,
|
|
||||||
Width = 38,
|
Width = 38,
|
||||||
Height = 28,
|
Height = 28,
|
||||||
Background = Brushes.Transparent,
|
Background = Brushes.Transparent,
|
||||||
Foreground = new SolidColorBrush(btnText),
|
Foreground = new SolidColorBrush(btnText),
|
||||||
BorderThickness = new Thickness(0),
|
BorderThickness = new Thickness(0),
|
||||||
FontSize = 13,
|
|
||||||
CornerRadius = new CornerRadius(7),
|
CornerRadius = new CornerRadius(7),
|
||||||
|
Padding = new Thickness(0),
|
||||||
Margin = new Thickness(2, 0, 0, 0),
|
Margin = new Thickness(2, 0, 0, 0),
|
||||||
HorizontalContentAlignment = HorizontalAlignment.Center,
|
HorizontalContentAlignment = HorizontalAlignment.Center,
|
||||||
VerticalContentAlignment = VerticalAlignment.Center,
|
VerticalContentAlignment = VerticalAlignment.Center,
|
||||||
@@ -109,12 +113,11 @@ public sealed class PlayerWindow : Window
|
|||||||
// 悬停:深色标题栏用亮一点的同调色,浅色标题栏用浅灰,避免出现突兀的深色块
|
// 悬停:深色标题栏用亮一点的同调色,浅色标题栏用浅灰,避免出现突兀的深色块
|
||||||
var hover = isClose ? Color.Parse("#D64545")
|
var hover = isClose ? Color.Parse("#D64545")
|
||||||
: IsLight(barBg) ? Color.Parse("#EDF2FC") : Color.Parse("#223252");
|
: IsLight(barBg) ? Color.Parse("#EDF2FC") : Color.Parse("#223252");
|
||||||
var hoverText = isClose ? Colors.White
|
|
||||||
: IsLight(barBg) ? (Color?)Color.Parse("#111A2E") : Colors.White;
|
|
||||||
b.PointerEntered += (_, _) =>
|
b.PointerEntered += (_, _) =>
|
||||||
{
|
{
|
||||||
b.Background = new SolidColorBrush(hover);
|
b.Background = new SolidColorBrush(hover);
|
||||||
if (hoverText.HasValue) b.Foreground = new SolidColorBrush(hoverText.Value);
|
b.Foreground = new SolidColorBrush(isClose ? Colors.White
|
||||||
|
: IsLight(barBg) ? Color.Parse("#111A2E") : Colors.White);
|
||||||
};
|
};
|
||||||
b.PointerExited += (_, _) =>
|
b.PointerExited += (_, _) =>
|
||||||
{
|
{
|
||||||
@@ -122,15 +125,47 @@ public sealed class PlayerWindow : Window
|
|||||||
b.Foreground = new SolidColorBrush(btnText);
|
b.Foreground = new SolidColorBrush(btnText);
|
||||||
};
|
};
|
||||||
b.Classes.Add("model-titlebtn");
|
b.Classes.Add("model-titlebtn");
|
||||||
|
_titleButtons.Add(b);
|
||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
var minimizeButton = TitleButton("—", 2);
|
// 图标:全部按 10×10 视框绘制,描边 1.1,随按钮等比缩放
|
||||||
var maximizeButton = TitleButton("□", 3);
|
Avalonia.Controls.Shapes.Path Glyph(string path)
|
||||||
var closeButton = TitleButton("✕", 4, isClose: true);
|
{
|
||||||
|
var p = new Avalonia.Controls.Shapes.Path
|
||||||
|
{
|
||||||
|
Data = Geometry.Parse(path),
|
||||||
|
Stroke = new SolidColorBrush(btnText),
|
||||||
|
StrokeThickness = 1.15,
|
||||||
|
StrokeLineCap = PenLineCap.Round,
|
||||||
|
StrokeJoin = PenLineJoin.Round,
|
||||||
|
Fill = null,
|
||||||
|
Stretch = Stretch.None,
|
||||||
|
Width = 10,
|
||||||
|
Height = 10
|
||||||
|
};
|
||||||
|
p.Classes.Add("model-titleglyph");
|
||||||
|
_titleGlyphs.Add(p);
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
var minimizeButton = TitleButton(2);
|
||||||
|
minimizeButton.Content = Glyph("M1,5 L9,5");
|
||||||
|
|
||||||
|
var maximizeButton = TitleButton(3);
|
||||||
|
var restoreGlyph = Glyph("M2.5,3.5 L8.5,3.5 L8.5,9.5 L2.5,9.5 Z M2.5,3.5 L2.5,1.5 L8.5,1.5 L8.5,7.5 L8.5,3.5");
|
||||||
|
var maxGlyph = Glyph("M2,2 L8,2 L8,8 L2,8 Z");
|
||||||
|
maximizeButton.Content = maxGlyph;
|
||||||
|
|
||||||
|
var closeButton = TitleButton(4, isClose: true);
|
||||||
|
var closeGlyph = Glyph("M1.5,1.5 L8.5,8.5 M8.5,1.5 L1.5,8.5");
|
||||||
|
closeButton.Content = closeGlyph;
|
||||||
|
|
||||||
minimizeButton.Click += (_, _) => WindowState = WindowState.Minimized;
|
minimizeButton.Click += (_, _) => WindowState = WindowState.Minimized;
|
||||||
maximizeButton.Click += (_, _) => ToggleMaximize();
|
maximizeButton.Click += (_, _) => ToggleMaximize();
|
||||||
closeButton.Click += (_, _) => Close();
|
closeButton.Click += (_, _) => Close();
|
||||||
|
_maximizeGlyph = maxGlyph;
|
||||||
|
_restoreGlyph = restoreGlyph;
|
||||||
|
|
||||||
var titleBar = new Border
|
var titleBar = new Border
|
||||||
{
|
{
|
||||||
@@ -216,6 +251,12 @@ public sealed class PlayerWindow : Window
|
|||||||
_helpButton.Padding = new Thickness(Math.Round(12 * scale), 0);
|
_helpButton.Padding = new Thickness(Math.Round(12 * scale), 0);
|
||||||
_helpButton.CornerRadius = new CornerRadius(Math.Round(7 * scale, 1));
|
_helpButton.CornerRadius = new CornerRadius(Math.Round(7 * scale, 1));
|
||||||
}
|
}
|
||||||
|
foreach (var g in _titleGlyphs)
|
||||||
|
{
|
||||||
|
g.Width = Math.Round(10 * scale, 1);
|
||||||
|
g.Height = Math.Round(10 * scale, 1);
|
||||||
|
g.StrokeThickness = Math.Round(1.15 * scale, 2);
|
||||||
|
}
|
||||||
if (_titleText != null)
|
if (_titleText != null)
|
||||||
{
|
{
|
||||||
_titleText.FontSize = Math.Round(BaseTitleFont * scale, 1);
|
_titleText.FontSize = Math.Round(BaseTitleFont * scale, 1);
|
||||||
@@ -241,16 +282,16 @@ public sealed class PlayerWindow : Window
|
|||||||
private void UpdateMaximizeVisual()
|
private void UpdateMaximizeVisual()
|
||||||
{
|
{
|
||||||
var max = WindowState == WindowState.Maximized || WindowState == WindowState.FullScreen;
|
var max = WindowState == WindowState.Maximized || WindowState == WindowState.FullScreen;
|
||||||
if (_maximizeButton != null)
|
if (_maximizeButton != null && _maximizeGlyph != null && _restoreGlyph != null)
|
||||||
{
|
{
|
||||||
// ❐ 还原 / □ 最大化
|
// 矢量图标切换:还原态画「重叠方框」,最大化态画「单方框」
|
||||||
_maximizeButton.Content = max ? "❐" : "□";
|
_maximizeButton.Content = max ? _restoreGlyph : _maximizeGlyph;
|
||||||
Avalonia.Controls.ToolTip.SetTip(_maximizeButton, max
|
Avalonia.Controls.ToolTip.SetTip(_maximizeButton, max
|
||||||
? (IsEnglish() ? "Restore" : "还原")
|
? (IsEnglish() ? "Restore" : "还原")
|
||||||
: (IsEnglish() ? "Maximize" : "最大化"));
|
: (IsEnglish() ? "Maximize" : "最大化"));
|
||||||
}
|
}
|
||||||
// 最大化时贴边,不需要圆角;还原后恢复 16
|
// 最大化后同样保留圆角(用户要求:任何状态都要圆角)
|
||||||
if (_frame != null) _frame.CornerRadius = new CornerRadius(max ? 0 : 16);
|
if (_frame != null) _frame.CornerRadius = new CornerRadius(16);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Color ParseColor(string? hex, string fallback)
|
private static Color ParseColor(string? hex, string fallback)
|
||||||
@@ -342,48 +383,97 @@ public sealed class PlayerWindow : Window
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── 帮助窗口自建标题栏(带 ✕),与模型窗口同款配色 ──
|
||||||
|
var helpClose = new Button
|
||||||
|
{
|
||||||
|
Content = "✕",
|
||||||
|
Width = 34,
|
||||||
|
Height = 26,
|
||||||
|
Background = Brushes.Transparent,
|
||||||
|
Foreground = new SolidColorBrush(btnText),
|
||||||
|
BorderThickness = new Thickness(0),
|
||||||
|
FontSize = 12.5,
|
||||||
|
CornerRadius = new CornerRadius(7),
|
||||||
|
Margin = new Thickness(6, 0, 0, 0),
|
||||||
|
HorizontalContentAlignment = HorizontalAlignment.Center,
|
||||||
|
VerticalContentAlignment = VerticalAlignment.Center,
|
||||||
|
Cursor = new Cursor(StandardCursorType.Hand)
|
||||||
|
};
|
||||||
|
helpClose.PointerEntered += (_, _) =>
|
||||||
|
{
|
||||||
|
helpClose.Background = new SolidColorBrush(Color.Parse("#D64545"));
|
||||||
|
helpClose.Foreground = new SolidColorBrush(Colors.White);
|
||||||
|
};
|
||||||
|
helpClose.PointerExited += (_, _) =>
|
||||||
|
{
|
||||||
|
helpClose.Background = Brushes.Transparent;
|
||||||
|
helpClose.Foreground = new SolidColorBrush(btnText);
|
||||||
|
};
|
||||||
|
|
||||||
|
var helpTitle = new TextBlock
|
||||||
|
{
|
||||||
|
Text = title,
|
||||||
|
Foreground = new SolidColorBrush(barText),
|
||||||
|
FontSize = 16,
|
||||||
|
FontWeight = FontWeight.SemiBold,
|
||||||
|
VerticalAlignment = VerticalAlignment.Center
|
||||||
|
};
|
||||||
|
|
||||||
|
var helpBarGrid = new Grid
|
||||||
|
{
|
||||||
|
ColumnDefinitions = new ColumnDefinitions("*,Auto"),
|
||||||
|
Margin = new Thickness(22, 0, 12, 0)
|
||||||
|
};
|
||||||
|
helpBarGrid.Children.Add(helpTitle);
|
||||||
|
Grid.SetColumn(helpClose, 1);
|
||||||
|
helpBarGrid.Children.Add(helpClose);
|
||||||
|
|
||||||
|
var helpTitleBar = new Border
|
||||||
|
{
|
||||||
|
Height = 48,
|
||||||
|
Background = new SolidColorBrush(barBg),
|
||||||
|
BorderBrush = new SolidColorBrush(barBorder),
|
||||||
|
BorderThickness = new Thickness(0, 0, 0, 1),
|
||||||
|
Child = helpBarGrid
|
||||||
|
};
|
||||||
|
helpTitleBar.PointerPressed += (_, e) =>
|
||||||
|
{
|
||||||
|
if (e.GetCurrentPoint(helpTitleBar).Properties.IsLeftButtonPressed)
|
||||||
|
helpClose.FindAncestorOfType<Window>()?.BeginMoveDrag(e);
|
||||||
|
};
|
||||||
|
|
||||||
|
// ── 底部固定操作条:无论正文多长,「知道了」始终可见 ──
|
||||||
var ok = new Button
|
var ok = new Button
|
||||||
{
|
{
|
||||||
Content = IsEnglish() ? "Got it" : "知道了",
|
Content = IsEnglish() ? "Got it" : "知道了",
|
||||||
HorizontalAlignment = HorizontalAlignment.Right,
|
HorizontalAlignment = HorizontalAlignment.Right,
|
||||||
Padding = new Thickness(18, 7),
|
Padding = new Thickness(20, 8),
|
||||||
Margin = new Thickness(0, 14, 0, 0),
|
Background = new SolidColorBrush(Color.Parse("#2F6BFF")),
|
||||||
Background = new SolidColorBrush(barBorder),
|
Foreground = new SolidColorBrush(Colors.White),
|
||||||
Foreground = new SolidColorBrush(barText),
|
|
||||||
BorderThickness = new Thickness(0),
|
BorderThickness = new Thickness(0),
|
||||||
CornerRadius = new CornerRadius(8),
|
CornerRadius = new CornerRadius(8),
|
||||||
Cursor = new Cursor(StandardCursorType.Hand)
|
Cursor = new Cursor(StandardCursorType.Hand)
|
||||||
};
|
};
|
||||||
|
var footer = new Border
|
||||||
// 标题固定在顶部,正文滚动;内容再长也不会被裁掉
|
|
||||||
var rootPanel = new DockPanel { LastChildFill = true };
|
|
||||||
var header = new Border
|
|
||||||
{
|
{
|
||||||
Padding = new Thickness(24, 18, 24, 10),
|
Padding = new Thickness(24, 10, 24, 14),
|
||||||
Child = new StackPanel
|
BorderBrush = new SolidColorBrush(barBorder),
|
||||||
{
|
BorderThickness = new Thickness(0, 1, 0, 0),
|
||||||
Spacing = 8,
|
Child = ok
|
||||||
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 rootPanel = new DockPanel { LastChildFill = true };
|
||||||
|
DockPanel.SetDock(helpTitleBar, Dock.Top);
|
||||||
|
rootPanel.Children.Add(helpTitleBar);
|
||||||
|
DockPanel.SetDock(footer, Dock.Bottom);
|
||||||
|
rootPanel.Children.Add(footer);
|
||||||
var scroll = new ScrollViewer
|
var scroll = new ScrollViewer
|
||||||
{
|
{
|
||||||
Content = new StackPanel
|
Content = new Border
|
||||||
{
|
{
|
||||||
Margin = new Thickness(24, 0, 24, 8),
|
Margin = new Thickness(24, 14, 24, 10),
|
||||||
Children = { body, ok }
|
Child = body
|
||||||
},
|
},
|
||||||
VerticalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Auto,
|
VerticalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Auto,
|
||||||
HorizontalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled
|
HorizontalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled
|
||||||
@@ -394,9 +484,9 @@ public sealed class PlayerWindow : Window
|
|||||||
{
|
{
|
||||||
Title = title,
|
Title = title,
|
||||||
Width = 660,
|
Width = 660,
|
||||||
Height = Math.Min(720, 240 + sections.Sum(s => s.Lines.Count * 24 + 40)),
|
Height = Math.Min(760, 230 + sections.Sum(s => s.Lines.Count * 24 + 40)),
|
||||||
MinWidth = 480,
|
MinWidth = 480,
|
||||||
MinHeight = 300,
|
MinHeight = 320,
|
||||||
Background = Brushes.Transparent,
|
Background = Brushes.Transparent,
|
||||||
TransparencyLevelHint = new[] { WindowTransparencyLevel.Transparent },
|
TransparencyLevelHint = new[] { WindowTransparencyLevel.Transparent },
|
||||||
SystemDecorations = SystemDecorations.None,
|
SystemDecorations = SystemDecorations.None,
|
||||||
@@ -412,6 +502,7 @@ public sealed class PlayerWindow : Window
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
ok.Click += (_, _) => win.Close();
|
ok.Click += (_, _) => win.Close();
|
||||||
|
helpClose.Click += (_, _) => win.Close();
|
||||||
win.Show(this);
|
win.Show(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -13,7 +13,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+7de92a25f5b91dfe2b85dcd95639fdcc353badf2")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5+0e86c17056e384fb4781e834170635823c62658e")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.0")]
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
bf9e7961280762c40f0481f1ccb3df53604cd782eafe0cf22bcab1892d1ab2f1
|
eeba77f58bc37c2a48ddfc40d684ae719d40fea8d2473797eab929f51fbc25a8
|
||||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+10
-10
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"schema": 1,
|
"schema": 1,
|
||||||
"generated": "2026-11-12T11:29:46Z",
|
"generated": "2026-11-12T11:34:37Z",
|
||||||
"repository": "https://gitcode.com/2509_92447106/GC",
|
"repository": "https://gitcode.com/2509_92447106/GC",
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"modelDir": "model",
|
"modelDir": "model",
|
||||||
"launcher": {
|
"launcher": {
|
||||||
"version": "1.0.4",
|
"version": "1.0.4",
|
||||||
"revision": "f43354e248",
|
"revision": "2480674708",
|
||||||
"packages": {
|
"packages": {
|
||||||
"win-x64": {
|
"win-x64": {
|
||||||
"path": "dist/GC-win-x64.zip",
|
"path": "dist/GC-win-x64.zip",
|
||||||
@@ -33,26 +33,26 @@
|
|||||||
"models": [
|
"models": [
|
||||||
{
|
{
|
||||||
"id": "earth-geography",
|
"id": "earth-geography",
|
||||||
"version": "1.6",
|
"version": "1.7",
|
||||||
"build": "c568a1b05e",
|
"build": "4720687a18",
|
||||||
"dir": "model/earth-geography"
|
"dir": "model/earth-geography"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "earth-revolution",
|
"id": "earth-revolution",
|
||||||
"version": "1.4",
|
"version": "1.5",
|
||||||
"build": "41a6e0ead8",
|
"build": "fdc1b059c5",
|
||||||
"dir": "model/earth-revolution"
|
"dir": "model/earth-revolution"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "earth-rotation",
|
"id": "earth-rotation",
|
||||||
"version": "1.4",
|
"version": "1.5",
|
||||||
"build": "5544dcea30",
|
"build": "f98f989f79",
|
||||||
"dir": "model/earth-rotation"
|
"dir": "model/earth-rotation"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "scale-calculator",
|
"id": "scale-calculator",
|
||||||
"version": "1.3",
|
"version": "1.4",
|
||||||
"build": "f6418437d4",
|
"build": "47ba2697da",
|
||||||
"dir": "model/scale-calculator"
|
"dir": "model/scale-calculator"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in new issue
Block a user