Skip to content

fix: 在弹出mc更新提示弹窗时使用ESC键会打开Wiki #2892

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

Draft
qiMengStars wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

fix: 在弹出mc更新提示弹窗时使用ESC键会打开Wiki #2892

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
269ce55
fix: mc更新提示弹窗按ESC会打开wiki
qiMengStars May 24, 2026
63cb15e
Revert: mc更新提示弹窗按ESC会打开wiki(#269ce555a8)
qiMengStars May 27, 2026
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
5 changes: 3 additions & 2 deletions Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ public static void McDownloadClientUpdateHint(string versionName, JsonObject jso
? Lang.Text("Minecraft.Update.UpdateTime") + Lang.Date(time)
: Lang.Text("Minecraft.Update.UpdatedAt") + Lang.TimeSpan(time - DateTime.Now));
var msgResult = ModMain.MyMsgBox(msgBoxText, Lang.Text("Minecraft.Update.Title"),
Lang.Text("Common.Action.Confirm"), Lang.Text("Common.Action.Download"),
(DateTime.Now - time).TotalHours > 3d ? Lang.Text("Common.Action.UpdateLog") : "",

@MoYuan-CN MoYuan-CN May 25, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

重新看了一下这处修改，根据 MyMsgBox (MyMsgText) 的实现，

PCL-CE/Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml.cs

Lines 16 to 37 in cca4ef8

try
{
InitializeComponent();
Btn1.Name = Btn1.Name + ModBase.GetUuid();
Btn2.Name = Btn2.Name + ModBase.GetUuid();
Btn3.Name = Btn3.Name + ModBase.GetUuid();
MyConverter = Converter;
LabTitle.Text = Converter.Title;
LabCaption.Text = Converter.Text;
Btn1.Text = Converter.Button1;
if (Converter.IsWarn)
{
Btn1.ColorType = MyButton.ColorState.Red;
LabTitle.SetResourceReference(TextBlock.ForegroundProperty, "ColorBrushRedLight");
}
Btn2.Text = Converter.Button2;
Btn3.Text = Converter.Button3;
Btn2.Visibility = string.IsNullOrEmpty(Converter.Button2) ? Visibility.Collapsed : Visibility.Visible;
Btn3.Visibility = string.IsNullOrEmpty(Converter.Button3) ? Visibility.Collapsed : Visibility.Visible;
ShapeLine.StrokeThickness = ModBase.GetWPFSize(1d);
}

把一个可选按钮放到第一按钮位置会导致逻辑上不显示这个按钮的时候生成一个空按钮

Button3Action: () => ModDownloadLib.McUpdateLogShow(version));
Lang.Text("Common.Action.Download"),
Lang.Text("Common.Action.Close"),
Button1Action: () => ModDownloadLib.McUpdateLogShow(version));
// 弹窗结果
if (msgResult == 2)
// 下载
Expand Down
Loading