### 2021-06-13更新

------
#### ryControls    V2.1.2106.1301
- *.[改进]点击窗口标题栏最大化时, 不覆盖桌面任务栏。

Bin/Debug/CommonControls/.NET4 示例/UserDb/Win.dat

@@ -1,2 +1,2 @@
 [Money_Op]
-hwnd=1118096
+hwnd=263848

Bin/Debug/CommonControls/.NET4 示例/cUpdate.dat

@@ -1,4 +1,4 @@
 <root>
-  <list id="LastUpdateTime" Value="2021/6/12 16:48:22" />
+  <list id="LastUpdateTime" Value="2021/6/13 23:15:28" />
   <list id="UpdateAfterTime" Value="0" />
 </root>

CHANGELOG.md

@@ -1,4 +1,10 @@
-### 2021-06-12更新
+### 2021-06-13更新
+------
+#### ryControls    V2.1.2106.1301
+
+- *.[改进]点击窗口标题栏最大化时, 不覆盖桌面任务栏。
+
+### 2021-06-12更新
 ------
 #### Itrycn_Project2    V1.0.2106.1201
 - *.[新增]新增加入皮肤功能。

Source/Itrycn_Project2/Config/Soft_Info.cs

@@ -50,8 +50,8 @@ namespace Itrycn_Project
         public const string QQ_Qun = "183161992";
         /// <summary>
         /// 关于界面内容.支持以下变量
-        /// #softname#:软件名称
+        /// <para>#softname#:软件名称</para>
-        /// #ver#:版本号
+        /// <para>#ver#:版本号</para>
         /// </summary>
         public const string AboutText = "#softname# #ver#";
         /// <summary>
@@ -69,6 +69,6 @@ namespace Itrycn_Project
         /// <summary>
         /// 是否显示捐赠方式
         /// </summary>
-        public static bool DonateVisabled = false;
+        public static bool DonateVisabled = true;
     }
 }

Source/Itrycn_Project2/FrmAbout.Designer.cs

@@ -53,7 +53,7 @@
             this.pnlTopLogo.Dock = System.Windows.Forms.DockStyle.Top;
             this.pnlTopLogo.Location = new System.Drawing.Point(1, 27);
             this.pnlTopLogo.Name = "pnlTopLogo";
-            this.pnlTopLogo.Size = new System.Drawing.Size(507, 59);
+            this.pnlTopLogo.Size = new System.Drawing.Size(523, 59);
             this.pnlTopLogo.TabIndex = 8;
             // 
             // lblTitle
@@ -71,7 +71,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.Transparent;
-            this.label1.Location = new System.Drawing.Point(12, 67);
+            this.label1.Location = new System.Drawing.Point(13, 99);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(35, 12);
             this.label1.TabIndex = 9;
@@ -92,7 +92,7 @@
             this.lblVisitUrl.Cursor = System.Windows.Forms.Cursors.Hand;
             this.lblVisitUrl.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblVisitUrl.ForeColor = System.Drawing.Color.Blue;
-            this.lblVisitUrl.Location = new System.Drawing.Point(53, 67);
+            this.lblVisitUrl.Location = new System.Drawing.Point(54, 99);
             this.lblVisitUrl.Name = "lblVisitUrl";
             this.lblVisitUrl.Size = new System.Drawing.Size(77, 12);
             this.lblVisitUrl.TabIndex = 11;
@@ -106,7 +106,7 @@
             this.LblQQ_Qun.Cursor = System.Windows.Forms.Cursors.Hand;
             this.LblQQ_Qun.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LblQQ_Qun.ForeColor = System.Drawing.Color.Blue;
-            this.LblQQ_Qun.Location = new System.Drawing.Point(234, 67);
+            this.LblQQ_Qun.Location = new System.Drawing.Point(235, 99);
             this.LblQQ_Qun.Name = "LblQQ_Qun";
             this.LblQQ_Qun.Size = new System.Drawing.Size(59, 12);
             this.LblQQ_Qun.TabIndex = 14;
@@ -126,7 +126,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.BackColor = System.Drawing.Color.Transparent;
-            this.label5.Location = new System.Drawing.Point(193, 67);
+            this.label5.Location = new System.Drawing.Point(194, 99);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(35, 12);
             this.label5.TabIndex = 12;
@@ -135,7 +135,7 @@
             // pictureBox1
             // 
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(85, 105);
+            this.pictureBox1.Location = new System.Drawing.Point(85, 145);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(319, 174);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -147,7 +147,7 @@
             this.label3.AutoSize = true;
             this.label3.BackColor = System.Drawing.Color.Transparent;
             this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.label3.Location = new System.Drawing.Point(13, 297);
+            this.label3.Location = new System.Drawing.Point(13, 337);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(365, 12);
             this.label3.TabIndex = 18;
@@ -158,7 +158,7 @@
             this.label6.AutoSize = true;
             this.label6.BackColor = System.Drawing.Color.Transparent;
             this.label6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(100, 90);
+            this.label6.Location = new System.Drawing.Point(100, 130);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(285, 12);
             this.label6.TabIndex = 19;
@@ -169,18 +169,17 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(509, 336);
+            this.ClientSize = new System.Drawing.Size(525, 360);
             this.Controls.Add(this.label6);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.pictureBox1);
-            this.Controls.Add(this.LblQQ_Qun);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.lblVisitUrl);
-            this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
+            this.Controls.Add(this.lblVisitUrl);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.LblQQ_Qun);
+            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.pnlTopLogo);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.Name = "FrmAbout";

Source/Itrycn_Project2/FrmStart.Designer.cs

@@ -41,6 +41,8 @@
             this.捐助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.chromeTabControl1 = new ryControls.ChromeTabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.工具ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.选项ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.MenuTray.SuspendLayout();
             this.menuStrip1.SuspendLayout();
             this.chromeTabControl1.SuspendLayout();
@@ -77,6 +79,7 @@
             // menuStrip1
             // 
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.工具ToolStripMenuItem,
             this.关于ToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(1, 27);
             this.menuStrip1.Name = "menuStrip1";
@@ -96,14 +99,14 @@
             // 打开官网ToolStripMenuItem
             // 
             this.打开官网ToolStripMenuItem.Name = "打开官网ToolStripMenuItem";
-            this.打开官网ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.打开官网ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.打开官网ToolStripMenuItem.Text = "打开官网";
             this.打开官网ToolStripMenuItem.Click += new System.EventHandler(this.打开官网ToolStripMenuItem_Click);
             // 
             // 捐助ToolStripMenuItem
             // 
             this.捐助ToolStripMenuItem.Name = "捐助ToolStripMenuItem";
-            this.捐助ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.捐助ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.捐助ToolStripMenuItem.Text = "关于和捐助";
             this.捐助ToolStripMenuItem.Click += new System.EventHandler(this.捐助ToolStripMenuItem_Click);
             // 
@@ -138,6 +141,21 @@
             this.tabPage1.Text = "首页";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
+            // 工具ToolStripMenuItem
+            // 
+            this.工具ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.选项ToolStripMenuItem});
+            this.工具ToolStripMenuItem.Name = "工具ToolStripMenuItem";
+            this.工具ToolStripMenuItem.Size = new System.Drawing.Size(44, 21);
+            this.工具ToolStripMenuItem.Text = "工具";
+            // 
+            // 选项ToolStripMenuItem
+            // 
+            this.选项ToolStripMenuItem.Name = "选项ToolStripMenuItem";
+            this.选项ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.选项ToolStripMenuItem.Text = "选项";
+            this.选项ToolStripMenuItem.Click += new System.EventHandler(this.选项ToolStripMenuItem_Click);
+            // 
             // FrmStart
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -172,5 +190,7 @@
         private System.Windows.Forms.ToolStripMenuItem 关于ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 捐助ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 打开官网ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 工具ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 选项ToolStripMenuItem;
     }
 }

Source/Itrycn_Project2/FrmStart.cs

@@ -129,6 +129,7 @@ namespace Itrycn_Project2
 
         private void FrmStart_Load(object sender, EventArgs e)
         {
+            Public_Config.LoadSetting();
             RyFiles.AddDropDrag(tabPage1.Handle);
             //Itrycn_Project.Itrycn_Db.CreateTable();
             //var dbver = Itrycn_Db.GetDbVer();
@@ -150,5 +151,15 @@ namespace Itrycn_Project2
             LiveUpdate.RyUpdate update = new LiveUpdate.RyUpdate(Soft_ConstInfo.Update_Url);
             update.CheckUpdate();
         }
+
+        private void 选项ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            FrmSetting frm = new FrmSetting();
+            if(frm.ShowDialog()==DialogResult.OK)
+            {
+                Public_Config.LoadSetting();
+            }
+            frm.Dispose();
+        }
     }
 }

Source/Itrycn_Project2/Program.cs

@@ -22,8 +22,8 @@ namespace Itrycn_Project
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Soft_ConstInfo.UserDataFolder = ryCommon.RyFiles.GetRealPath(Soft_ConstInfo.UserDataFolder);
             Soft_ConstInfo.SysDataFolder = ryCommon.RyFiles.GetRealPath(Soft_ConstInfo.SysDataFolder);
+            Soft_ConstInfo.UserDataFolder = ryCommon.RyFiles.GetRealPath(Soft_ConstInfo.UserDataFolder);
             run = new System.Threading.Mutex(true, Soft_ConstInfo.Soft_Id, out bool runone);
             if (!runone) //已经运行了
             {

Source/Itrycn_Project2/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2106.1201")]
+[assembly: AssemblyVersion("1.0.2106.1301")]
-[assembly: AssemblyFileVersion("1.0.2106.1201")]
+[assembly: AssemblyFileVersion("1.0.2106.1301")]

Source/ryControls/Gdu.WinFormUI/Forms/ControlBoxManager.cs

@@ -92,6 +92,8 @@ namespace MGdu.WinFormUI
             // max res box
             if (_owner.MaximizeBox)
             {
+                var curScreen = Screen.FromControl(_owner);
+                _owner.MaximumSize = new Size(curScreen.WorkingArea.Width, curScreen.WorkingArea.Height);
                 maxBtn = new WLButton(_owner);
                 resBtn = new WLButton(_owner);
 

Source/ryControls/Gdu.WinFormUI/Forms/GMForm.cs

@@ -969,7 +969,7 @@ namespace MGdu.WinFormUI
             if (base.WindowState == FormWindowState.Normal)
             {
                 var size = base.Size;
-                if (!this.DesignMode)
+                //if (!this.DesignMode)
                 {
                     size.Width += XTheme.ShadowWidth * 2;
                     size.Height += XTheme.ShadowWidth * 2;

Source/ryControls/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.2105.2201")]
+[assembly: AssemblyVersion("3.0.2106.1301")]
-[assembly: AssemblyFileVersion("3.0.2105.2201")]
+[assembly: AssemblyFileVersion("3.0.2106.1301")]