diff --git a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe
index 86e9c39..3b7db33 100644
Binary files a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe and b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project.exe differ
diff --git a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe
index 42ae32c..2bf9a9c 100644
Binary files a/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe and b/Bin/Debug/CommonControls/.NET4 示例/Itrycn_Project2.exe differ
diff --git a/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll b/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll
index 011d0a2..357b85a 100644
Binary files a/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll and b/Bin/Debug/CommonControls/.NET4 示例/MyDb.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll b/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll
index accefbf..e85cb54 100644
Binary files a/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll and b/Bin/Debug/CommonControls/.NET4 示例/MyDb_SQLite.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll b/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll
index 6cb63e6..c45563e 100644
Binary files a/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll and b/Bin/Debug/CommonControls/.NET4 示例/RyPrint.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat b/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat
index 6dce1f1..ad88b6e 100644
--- a/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat
+++ b/Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat
@@ -1,2 +1,2 @@
[Money_Op]
-hwnd=3742496
+hwnd=4207474
diff --git a/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat b/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat
index 1a45b61..9db8656 100644
--- a/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat
+++ b/Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll b/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll
index 089a896..0b65b6b 100644
Binary files a/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll and b/Bin/Debug/CommonControls/.NET4 示例/ryControls.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll b/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll
index 1a0f367..e83a60d 100644
Binary files a/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll and b/Bin/Debug/CommonControls/.NET4 示例/ryUpdate.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4/MyDb.dll b/Bin/Debug/CommonControls/.NET4/MyDb.dll
index 011d0a2..357b85a 100644
Binary files a/Bin/Debug/CommonControls/.NET4/MyDb.dll and b/Bin/Debug/CommonControls/.NET4/MyDb.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll b/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll
index 89d3dbe..3b5e47d 100644
Binary files a/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll and b/Bin/Debug/CommonControls/.NET4/MyDb_MySQL.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll b/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll
index accefbf..e85cb54 100644
Binary files a/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll and b/Bin/Debug/CommonControls/.NET4/MyDb_SQLite.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4/RyPrint.dll b/Bin/Debug/CommonControls/.NET4/RyPrint.dll
index 6cb63e6..c45563e 100644
Binary files a/Bin/Debug/CommonControls/.NET4/RyPrint.dll and b/Bin/Debug/CommonControls/.NET4/RyPrint.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4/ryControls.dll b/Bin/Debug/CommonControls/.NET4/ryControls.dll
index 089a896..0b65b6b 100644
Binary files a/Bin/Debug/CommonControls/.NET4/ryControls.dll and b/Bin/Debug/CommonControls/.NET4/ryControls.dll differ
diff --git a/Bin/Debug/CommonControls/.NET4/ryUpdate.dll b/Bin/Debug/CommonControls/.NET4/ryUpdate.dll
index 1a0f367..e83a60d 100644
Binary files a/Bin/Debug/CommonControls/.NET4/ryUpdate.dll and b/Bin/Debug/CommonControls/.NET4/ryUpdate.dll differ
diff --git a/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe b/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe
index 865c184..444cddf 100644
Binary files a/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe and b/Bin/Release/CommonControls/.NET4 示例/Itrycn_Project.exe differ
diff --git a/Bin/Release/CommonControls/.NET4 示例/MyDb.dll b/Bin/Release/CommonControls/.NET4 示例/MyDb.dll
index 5e23037..cc7fcc0 100644
Binary files a/Bin/Release/CommonControls/.NET4 示例/MyDb.dll and b/Bin/Release/CommonControls/.NET4 示例/MyDb.dll differ
diff --git a/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll b/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll
index 1bdc21b..0972e0b 100644
Binary files a/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll and b/Bin/Release/CommonControls/.NET4 示例/MyDb_SQLite.dll differ
diff --git a/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll b/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll
index faa4423..4b7fde8 100644
Binary files a/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll and b/Bin/Release/CommonControls/.NET4 示例/RyPrint.dll differ
diff --git a/Bin/Release/CommonControls/.NET4 示例/ryControls.dll b/Bin/Release/CommonControls/.NET4 示例/ryControls.dll
index cfa328b..f9de466 100644
Binary files a/Bin/Release/CommonControls/.NET4 示例/ryControls.dll and b/Bin/Release/CommonControls/.NET4 示例/ryControls.dll differ
diff --git a/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll b/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll
index ff91cd9..750fb7f 100644
Binary files a/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll and b/Bin/Release/CommonControls/.NET4 示例/ryUpdate.dll differ
diff --git a/Bin/Release/CommonControls/.NET4/MyDb.dll b/Bin/Release/CommonControls/.NET4/MyDb.dll
index 5e23037..cc7fcc0 100644
Binary files a/Bin/Release/CommonControls/.NET4/MyDb.dll and b/Bin/Release/CommonControls/.NET4/MyDb.dll differ
diff --git a/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll b/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll
index a2dfad7..c4002ce 100644
Binary files a/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll and b/Bin/Release/CommonControls/.NET4/MyDb_MySQL.dll differ
diff --git a/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll b/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll
index 1bdc21b..0972e0b 100644
Binary files a/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll and b/Bin/Release/CommonControls/.NET4/MyDb_SQLite.dll differ
diff --git a/Bin/Release/CommonControls/.NET4/RyPrint.dll b/Bin/Release/CommonControls/.NET4/RyPrint.dll
index faa4423..4b7fde8 100644
Binary files a/Bin/Release/CommonControls/.NET4/RyPrint.dll and b/Bin/Release/CommonControls/.NET4/RyPrint.dll differ
diff --git a/Bin/Release/CommonControls/.NET4/ryControls.dll b/Bin/Release/CommonControls/.NET4/ryControls.dll
index cfa328b..f9de466 100644
Binary files a/Bin/Release/CommonControls/.NET4/ryControls.dll and b/Bin/Release/CommonControls/.NET4/ryControls.dll differ
diff --git a/Bin/Release/CommonControls/.NET4/ryUpdate.dll b/Bin/Release/CommonControls/.NET4/ryUpdate.dll
index ff91cd9..750fb7f 100644
Binary files a/Bin/Release/CommonControls/.NET4/ryUpdate.dll and b/Bin/Release/CommonControls/.NET4/ryUpdate.dll differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index caae0ef..4120286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,15 @@
-### 2022-05-07更新
+### 2022-05-09更新
+------
+#### MyDbV4 V3.0.2205.0901
+- *.[改进]RyForm类的Show函数针对窗体最小化或不在屏幕内的情况做出优化。
+- *.[改进]OpenFile函数在打开文件夹时,会调用默认资源管理器打开,而不再限定为系统。
+
+#### ryControls V3.0.2205.0901
+
+- *.[改进]GMForm窗体在最大化时不可移动窗体。
+- *.[改进]改进ObjectListview列表中的按钮显示效果。
+
+### 2022-05-07更新
------
#### MyDbV4 V3.0.2205.0701
- *.[新增]新增多个注册表操作相关函数。
diff --git a/Source/Itrycn_Project2/FrmStart.Designer.cs b/Source/Itrycn_Project2/FrmStart.Designer.cs
index 9069dfe..260ff3c 100644
--- a/Source/Itrycn_Project2/FrmStart.Designer.cs
+++ b/Source/Itrycn_Project2/FrmStart.Designer.cs
@@ -215,6 +215,7 @@
this.Controls.Add(this.chromeTabControl1);
this.Location = new System.Drawing.Point(0, 0);
this.Name = "FrmStart";
+ this.Resizable = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmStart";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmStart_FormClosing);
diff --git a/Source/MyDb/FileFuns/RyFiles.cs b/Source/MyDb/FileFuns/RyFiles.cs
index 8246ee6..d2630d5 100644
--- a/Source/MyDb/FileFuns/RyFiles.cs
+++ b/Source/MyDb/FileFuns/RyFiles.cs
@@ -661,9 +661,17 @@ namespace ryCommon
///
public static int OpenFile(string FilePath)
{
- return RunFile(FilePath, "");
- }
- [DllImport("Kernel32", CharSet = CharSet.Unicode)]
+ if (System.IO.Directory.Exists(FilePath))
+ {
+ System.Diagnostics.Process.Start(FilePath);
+ return 0;
+ }
+ else
+ {
+ return RunFile(FilePath, "");
+ }
+ }
+ [DllImport("Kernel32", CharSet = CharSet.Unicode)]
private static extern Int32 GetShortPathName(String path, StringBuilder shortPath, Int32 shortPathLength);
///
/// 打开文件夹并定位文件
diff --git a/Source/MyDb/Properties/AssemblyInfo.cs b/Source/MyDb/Properties/AssemblyInfo.cs
index 2cc2bba..a33fa43 100644
--- a/Source/MyDb/Properties/AssemblyInfo.cs
+++ b/Source/MyDb/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.2205.0701")]
-[assembly: AssemblyFileVersion("3.0.2205.0701")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.0.2205.0901")]
+[assembly: AssemblyFileVersion("3.0.2205.0901")]
\ No newline at end of file
diff --git a/Source/MyDb/SysFuns/RyForm.cs b/Source/MyDb/SysFuns/RyForm.cs
index 0380318..3271140 100644
--- a/Source/MyDb/SysFuns/RyForm.cs
+++ b/Source/MyDb/SysFuns/RyForm.cs
@@ -152,6 +152,23 @@ namespace ryCommon
public static void Show(Form frm)
{
bool topmost = frm.TopMost;
+ if(frm.WindowState!= FormWindowState.Normal)
+ {
+ frm.WindowState= FormWindowState.Normal;
+ }
+ var screen = Screen.PrimaryScreen.WorkingArea;
+ if (!screen.Contains(frm.Location))
+ {
+ frm.Location = new Point((screen.Width-frm.Width)/2, (screen.Height - frm.Height) / 2);
+ }
+ else if (!screen.Contains(new Point(frm.Left,frm.Top+100)))
+ {
+ frm.Location = new Point((screen.Width - frm.Width) / 2, (screen.Height - frm.Height) / 2);
+ }
+ else if (!screen.Contains(new Point(frm.Left+100, frm.Top)))
+ {
+ frm.Location = new Point((screen.Width - frm.Width) / 2, (screen.Height - frm.Height) / 2);
+ }
frm.BringToFront();
frm.TopMost = true;
frm.TopMost = topmost;
diff --git a/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs b/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs
index 295d65c..7eaa442 100644
--- a/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs
+++ b/Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs
@@ -1360,6 +1360,7 @@ namespace MGdu.WinFormUI
alreadyHandled = WmNcCalcSize(ref m);
break;
case (int)Win32.WinAPI.WindowMessages.WM_NCHITTEST:
+ if(base.WindowState!= FormWindowState.Maximized)
alreadyHandled = WmNcHitTest(ref m);
break;
@@ -1599,7 +1600,9 @@ namespace MGdu.WinFormUI
{
base.OnMouseMove(e);
if (ControlBox)
+ {
controlBoxManager.MouseOperation(e.Location, MouseOperationType.Move);
+ }
if (IsMdiContainer && _mdiBarController != null)
_mdiBarController.MouseOperation(e.Location, MouseOperationType.Move);
}
diff --git a/Source/ryControls/ObjectListView/Rendering/Util_GDI.cs b/Source/ryControls/ObjectListView/Rendering/Util_GDI.cs
index b3f0e0b..d8abbec 100644
--- a/Source/ryControls/ObjectListView/Rendering/Util_GDI.cs
+++ b/Source/ryControls/ObjectListView/Rendering/Util_GDI.cs
@@ -96,11 +96,16 @@ namespace BrightIdeasSoftware.Rendering
RoundStyle style,
int roundWidth, bool drawBorder)
{
- RenderBackgroundInternal(g, rect, baseColor, borderColor, innerBorderColor, style, roundWidth, 0.35f, drawBorder, false, LinearGradientMode.Vertical);
+ var rect2 = rect;
+ rect2.X += 2;
+ rect2.Y += 2;
+ rect2.Width -= 6;
+ rect2.Height -=16;
+ RenderBackgroundInternal(g, rect2, baseColor, borderColor, innerBorderColor, style, roundWidth, 0.35f, drawBorder, false, LinearGradientMode.Vertical);
StringFormat sf = new StringFormat();
sf.Alignment = StringAlignment.Center;
sf.LineAlignment = StringAlignment.Center;
- g.DrawString(Text, new Font("宋体", 10), new SolidBrush(ForeColor), rect, sf);
+ g.DrawString(Text, new Font("宋体", 9), new SolidBrush(ForeColor), rect2, sf);
}
private static void RenderBackgroundInternal(
Graphics g,
diff --git a/Source/ryControls/Properties/AssemblyInfo.cs b/Source/ryControls/Properties/AssemblyInfo.cs
index 45f4aae..369c99f 100644
--- a/Source/ryControls/Properties/AssemblyInfo.cs
+++ b/Source/ryControls/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.2204.1201")]
-[assembly: AssemblyFileVersion("3.0.2204.1201")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.0.2205.0901")]
+[assembly: AssemblyFileVersion("3.0.2205.0901")]
\ No newline at end of file