Skip to content

imp: 再次优化了 MotD 的显示效果 #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 24, 2025
Merged

imp: 再次优化了 MotD 的显示效果 #109

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad66e45
imp: 再次优化了 MotD 的显示效果
pynickle Oct 7, 2025
9ed71b7
优化部分代码
pynickle Oct 8, 2025
dcc0deb
Merge branch 'main' into imp/motd
pynickle Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions UI/Controls/MotdRenderer.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,15 @@ public static bool TryGetColorFromCode(string code, bool isDarkMode, out String?
return success;
}

public void RenderMotd(string motd, bool isDarkMode = true) {
public void RenderMotd(string motd, bool isDarkMode = true, int maxLines = int.MaxValue, double fontSize = 12, bool isCentered = true) {
MotdCanvas.Children.Clear();
_obfuscatedTextBlocks.Clear();

var colorMap = isDarkMode ? ColorMapWithBlackBackground : ColorMapWithWhiteBackground;
var font = Config.UI.MotdFont; // Assuming Setup is a static class accessible in the project
var font = Config.UI.MotdFont;
var fontFamily = new FontFamily(string.IsNullOrWhiteSpace(font)
? "./Resources/#PCL English, Segoe UI, Microsoft YaHei UI"
: font);
const double fontSize = 12;
var canvasWidth = MotdCanvas.ActualWidth > 0 ? MotdCanvas.ActualWidth : 300; // Prevent zero width
var canvasHeight = MotdCanvas.ActualHeight > 0 ? MotdCanvas.ActualHeight : 34; // Prevent zero height
double y = 10;
Expand All @@ -204,7 +203,9 @@ public void RenderMotd(string motd, bool isDarkMode = true) {
var isStrikethrough = false;
var isObfuscated = false;

for (var lineIndex = 0; lineIndex < lines.Length; lineIndex++) {
// 限制显示的行数不超过maxLines
var lineCount = Math.Min(lines.Length, maxLines);
for (var lineIndex = 0; lineIndex < lineCount; lineIndex++) {
var line = lines[lineIndex].Trim();
var parts = RegexPatterns.MotdCode.Split(line);

Expand All @@ -215,12 +216,28 @@ public void RenderMotd(string motd, bool isDarkMode = true) {
var textBlocks = new List<TextBlock>(); // Store TextBlocks for the line
var positions = new List<double>(); // Store x-coordinates for each TextBlock

for (int i = 0; i < parts.Length; i++) {
// 找出第一个和最后一个不是格式符的文本部分的索引
var firstNonFormatPartIndex = -1;
var lastNonFormatPartIndex = -1;
for (var j = 0; j < parts.Length; j++)
{
var part = parts[j];
if (!string.IsNullOrEmpty(part) && !(part.StartsWith('§') && part.Length == 2) && !RegexPatterns.HexColor.IsMatch(part))
{
if (firstNonFormatPartIndex == -1)
{
firstNonFormatPartIndex = j;
}
lastNonFormatPartIndex = j;
}
}

for (var i = 0; i < parts.Length; i++) {
var part = parts[i];
var partTrimmed = part;
if (i == 0) {
if (i == firstNonFormatPartIndex) {
partTrimmed = part.TrimStart();
} else if (i == parts.Length - 1) {
} else if (i == lastNonFormatPartIndex) {
partTrimmed = part.TrimEnd();
}
if (string.IsNullOrEmpty(partTrimmed)) continue;
Expand Down Expand Up @@ -319,20 +336,22 @@ public void RenderMotd(string motd, bool isDarkMode = true) {
lineWidth = tempX; // Update line width
}

// Center-align: Adjust x-coordinates for each TextBlock
var offsetX = (canvasWidth - lineWidth) / 2;
for (var i = 0; i < textBlocks.Count; i++) {
Canvas.SetLeft(textBlocks[i], positions[i] + offsetX);
if (isCentered) {
// Center-align: Adjust x-coordinates for each TextBlock
var offsetX = (canvasWidth - lineWidth) / 2;
for (var i = 0; i < textBlocks.Count; i++) {
Canvas.SetLeft(textBlocks[i], positions[i] + offsetX);
}
}

// 计算当前行的垂直位置
double offsetY;
if (lines.Length == 1) {
if (lineCount == 1) {
// 单行文本居中
offsetY = (canvasHeight - lineHeight) / 2;
} else {
// 多行文本的位置计算
var totalHeight = lines.Length * lineHeight;
var totalHeight = lineCount * lineHeight; // 使用实际显示的行数计算总高度
var startOffset = (canvasHeight - totalHeight) / 2;
offsetY = startOffset + (lineIndex * lineHeight);
}
Expand Down
Loading