Skip to content

Commit 2ba27f7

Browse files
authored
Merge branch 'master' into patch-1
2 parents c5bd246 + 39c938e commit 2ba27f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2146
-879
lines changed
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: 错误报告
2+
description: 报告 ContextMenuManager 出现的错误
3+
title: "[Bug]: "
4+
labels: [ "bug" ]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: "# ContextMenuManager 错误报告"
9+
- type: checkboxes
10+
id: bug_check
11+
attributes:
12+
label: 检查项
13+
description: 在报告前,请确认以下内容:
14+
options:
15+
- label: 此错误未被报告过(可以在[这里](https://github.com/Jack251970/ContextMenuManager/issues?q=is%3Aissue)进行搜索)
16+
required: true
17+
- label: 我已将 ContextMenuManager 更新到最新版本
18+
required: true
19+
- label: 我已知晓:任何不合规定的 issue 都有可能被直接关闭
20+
required: true
21+
- type: dropdown
22+
id: bug_os
23+
attributes:
24+
label: Windows
25+
description: 您使用的Windows版本
26+
options:
27+
- Windows 7
28+
- Windows 8.x
29+
- Windows 10
30+
- Windows 11
31+
default: 4
32+
validations:
33+
required: true
34+
- type: input
35+
id: bug_version
36+
attributes:
37+
label: 版本
38+
description: 您发现此错误使用的 ContextMenuManager 版本
39+
placeholder: ContextMenuManager版本:Vx.x.x.x
40+
validations:
41+
required: true
42+
- type: textarea
43+
id: bug_reproducer
44+
attributes:
45+
label: 复现流程
46+
description: 请简单描述如何触发这一个错误
47+
placeholder: |
48+
1. xxx
49+
2. xxx
50+
3. xxx
51+
validations:
52+
required: true
53+
- type: markdown
54+
attributes:
55+
value: "### 感谢您对 ContextMenuManager 的支持!"
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: 新功能提交
2+
description: 写下您对添加新功能的一些建议
3+
title: "[Feat]: "
4+
labels: [ "enhancement" ]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: "# ContextMenuManager 新功能请求"
9+
- type: checkboxes
10+
id: feature_check
11+
attributes:
12+
label: 检查项
13+
description: 在提交前,请确认以下内容:
14+
options:
15+
- label: 此功能未被提出过(可以在[这里](https://github.com/Jack251970/ContextMenuManager/issues?q=is%3Aissue)进行搜索)
16+
required: true
17+
- label: ContextMenuManager 的最新版本并未添加此功能
18+
required: true
19+
- label: 我已知晓:如果只是某些想法,而不是具体的新功能,需要在 [Discussions](https://github.com/Jack251970/ContextMenuManager/discussions/new?category=%E6%83%B3%E6%B3%95) 中提交
20+
required: true
21+
- type: input
22+
id: feature_summary
23+
attributes:
24+
label: 简述
25+
description: 请简要叙述您所希望添加的新功能
26+
placeholder: |
27+
<对此功能的简要描述>
28+
- type: textarea
29+
id: feature_details
30+
attributes:
31+
label: 详细内容
32+
description: 请详细描述需要此功能的原因,以及此功能的内容
33+
placeholder: |
34+
<需要此功能的原因,以及此功能的详细内容>
35+
- type: markdown
36+
attributes:
37+
value: "### 感谢您对 ContextMenuManager 的支持!"

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ jobs:
5353
- name: Publish
5454
uses: softprops/action-gh-release@v2
5555
with:
56-
files: ContextMenuManager.exe
56+
files: bin\Publish\ContextMenuManager.exe
5757
tag_name: "${{ env.release_version }}"

ContextMenuManager/BluePointLilac.Controls/BackupDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected override bool RunDialog(IntPtr hwndOwner)
3434
frm.TvItems = TvItems;
3535
if (CmbSelectedText != null) frm.CmbSelectedText = CmbSelectedText;
3636
else frm.CmbSelectedIndex = CmbSelectedIndex;
37-
if (Control.FromHandle(hwndOwner) is Form owner) frm.TopMost = owner.TopMost;
37+
if (Control.FromHandle(hwndOwner) is Form owner) frm.TopMost = true;
3838
bool flag = frm.ShowDialog() == DialogResult.OK;
3939
if(flag)
4040
{

ContextMenuManager/BluePointLilac.Controls/DownloadDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected override void OnLoad(EventArgs e)
103103
if(Owner == null) StartPosition = FormStartPosition.CenterScreen;
104104
else
105105
{
106-
TopMost = Owner.TopMost;
106+
TopMost = true;
107107
StartPosition = FormStartPosition.CenterParent;
108108
}
109109
base.OnLoad(e);

ContextMenuManager/BluePointLilac.Controls/InputDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected override bool RunDialog(IntPtr hwndOwner)
2222
frm.Text = Title;
2323
frm.InputedText = Text;
2424
frm.Size = Size;
25-
if (Control.FromHandle(hwndOwner) is Form owner) frm.TopMost = owner.TopMost;
25+
if (Control.FromHandle(hwndOwner) is Form owner) frm.TopMost = true;
2626
bool flag = frm.ShowDialog() == DialogResult.OK;
2727
Text = flag ? frm.InputedText : null;
2828
return flag;

ContextMenuManager/BluePointLilac.Controls/LoadingDialog.Designer.cs

Lines changed: 140 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)