From 4787609e9eafd73398dfc699cc0434f8617d68c9 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期三, 07 一月 2026 16:50:44 +0800
Subject: [PATCH] 修复主界面菜单栏字体显示bug。
---
LB_SmartVision/VisionForm.resx | 36 +++++++++---------
LB_SmartVision/VisionForm.Designer.cs | 80 +++++++++++++++++----------------------
2 files changed, 53 insertions(+), 63 deletions(-)
diff --git a/LB_SmartVision/VisionForm.Designer.cs b/LB_SmartVision/VisionForm.Designer.cs
index 4e66a8e..a1feb7d 100644
--- a/LB_SmartVision/VisionForm.Designer.cs
+++ b/LB_SmartVision/VisionForm.Designer.cs
@@ -61,12 +61,11 @@
theme_VisionForm.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 0);
theme_VisionForm.Image = (Image)resources.GetObject("theme_VisionForm.Image");
theme_VisionForm.Location = new Point(0, 0);
- theme_VisionForm.Margin = new Padding(4);
theme_VisionForm.Name = "theme_VisionForm";
- theme_VisionForm.Padding = new Padding(12, 88, 12, 11);
+ theme_VisionForm.Padding = new Padding(10, 70, 10, 9);
theme_VisionForm.RoundCorners = true;
theme_VisionForm.Sizable = true;
- theme_VisionForm.Size = new Size(1440, 880);
+ theme_VisionForm.Size = new Size(1152, 704);
theme_VisionForm.SmartBounds = true;
theme_VisionForm.StartPosition = FormStartPosition.WindowsDefaultLocation;
theme_VisionForm.TabIndex = 0;
@@ -76,8 +75,7 @@
//
sc_VisionForm.Dock = DockStyle.Fill;
sc_VisionForm.FixedPanel = FixedPanel.Panel2;
- sc_VisionForm.Location = new Point(12, 88);
- sc_VisionForm.Margin = new Padding(4);
+ sc_VisionForm.Location = new Point(10, 70);
sc_VisionForm.Name = "sc_VisionForm";
sc_VisionForm.Orientation = Orientation.Horizontal;
//
@@ -88,9 +86,8 @@
// sc_VisionForm.Panel2
//
sc_VisionForm.Panel2.Controls.Add(grb_Info);
- sc_VisionForm.Size = new Size(1416, 781);
- sc_VisionForm.SplitterDistance = 596;
- sc_VisionForm.SplitterWidth = 5;
+ sc_VisionForm.Size = new Size(1132, 625);
+ sc_VisionForm.SplitterDistance = 476;
sc_VisionForm.TabIndex = 1;
//
// tlp_MainView
@@ -105,10 +102,10 @@
tlp_MainView.Margin = new Padding(2);
tlp_MainView.Name = "tlp_MainView";
tlp_MainView.RowCount = 3;
- tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 60F));
- tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 39F));
+ tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 48F));
+ tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 31F));
tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tlp_MainView.Size = new Size(1416, 596);
+ tlp_MainView.Size = new Size(1132, 476);
tlp_MainView.TabIndex = 1;
tlp_MainView.TagString = null;
//
@@ -117,12 +114,12 @@
materialTabControl.AccessibleRole = AccessibleRole.Sound;
materialTabControl.Depth = 0;
materialTabControl.Dock = DockStyle.Fill;
- materialTabControl.Location = new Point(2, 101);
+ materialTabControl.Location = new Point(2, 81);
materialTabControl.Margin = new Padding(2);
materialTabControl.MouseState = MaterialSkin.MouseState.HOVER;
materialTabControl.Name = "materialTabControl";
materialTabControl.SelectedIndex = 0;
- materialTabControl.Size = new Size(1412, 493);
+ materialTabControl.Size = new Size(1128, 393);
materialTabControl.TabIndex = 0;
//
// tlp_VisionMainOperator
@@ -143,25 +140,23 @@
tlp_VisionMainOperator.Controls.Add(btn_GlobalVar, 7, 0);
tlp_VisionMainOperator.Controls.Add(com_ProductName, 8, 0);
tlp_VisionMainOperator.Dock = DockStyle.Fill;
- tlp_VisionMainOperator.Location = new Point(4, 64);
- tlp_VisionMainOperator.Margin = new Padding(4);
+ tlp_VisionMainOperator.Location = new Point(3, 51);
tlp_VisionMainOperator.Name = "tlp_VisionMainOperator";
tlp_VisionMainOperator.RowCount = 1;
tlp_VisionMainOperator.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tlp_VisionMainOperator.Size = new Size(1408, 31);
+ tlp_VisionMainOperator.Size = new Size(1126, 25);
tlp_VisionMainOperator.TabIndex = 0;
tlp_VisionMainOperator.TagString = null;
//
// ckb_AllowRun
//
ckb_AllowRun.Dock = DockStyle.Fill;
- ckb_AllowRun.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+ ckb_AllowRun.Font = new Font("瀹嬩綋", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
ckb_AllowRun.ForeColor = SystemColors.Control;
- ckb_AllowRun.Location = new Point(4, 4);
- ckb_AllowRun.Margin = new Padding(4);
+ ckb_AllowRun.Location = new Point(3, 3);
ckb_AllowRun.MinimumSize = new Size(1, 1);
ckb_AllowRun.Name = "ckb_AllowRun";
- ckb_AllowRun.Size = new Size(148, 23);
+ ckb_AllowRun.Size = new Size(119, 19);
ckb_AllowRun.TabIndex = 2;
ckb_AllowRun.Text = "杩愯妯″紡";
//
@@ -172,16 +167,15 @@
btn_Login.Dock = DockStyle.Fill;
btn_Login.EnteredBorderColor = Color.FromArgb(165, 37, 37);
btn_Login.EnteredColor = Color.FromArgb(32, 34, 37);
- btn_Login.Font = new Font("Microsoft Sans Serif", 12F);
+ btn_Login.Font = new Font("瀹嬩綋", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
btn_Login.Image = null;
btn_Login.ImageAlign = ContentAlignment.MiddleLeft;
btn_Login.InactiveColor = Color.FromArgb(32, 34, 37);
- btn_Login.Location = new Point(160, 4);
- btn_Login.Margin = new Padding(4);
+ btn_Login.Location = new Point(128, 3);
btn_Login.Name = "btn_Login";
btn_Login.PressedBorderColor = Color.FromArgb(165, 37, 37);
btn_Login.PressedColor = Color.FromArgb(165, 37, 37);
- btn_Login.Size = new Size(148, 23);
+ btn_Login.Size = new Size(119, 19);
btn_Login.TabIndex = 3;
btn_Login.Text = "鐢ㄦ埛鐧诲綍";
btn_Login.TextAlignment = StringAlignment.Center;
@@ -194,16 +188,15 @@
btn_GlobalVar.Dock = DockStyle.Fill;
btn_GlobalVar.EnteredBorderColor = Color.FromArgb(165, 37, 37);
btn_GlobalVar.EnteredColor = Color.FromArgb(32, 34, 37);
- btn_GlobalVar.Font = new Font("Microsoft Sans Serif", 12F);
+ btn_GlobalVar.Font = new Font("瀹嬩綋", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0);
btn_GlobalVar.Image = null;
btn_GlobalVar.ImageAlign = ContentAlignment.MiddleLeft;
btn_GlobalVar.InactiveColor = Color.FromArgb(32, 34, 37);
- btn_GlobalVar.Location = new Point(1096, 4);
- btn_GlobalVar.Margin = new Padding(4);
+ btn_GlobalVar.Location = new Point(878, 3);
btn_GlobalVar.Name = "btn_GlobalVar";
btn_GlobalVar.PressedBorderColor = Color.FromArgb(165, 37, 37);
btn_GlobalVar.PressedColor = Color.FromArgb(165, 37, 37);
- btn_GlobalVar.Size = new Size(148, 23);
+ btn_GlobalVar.Size = new Size(119, 19);
btn_GlobalVar.TabIndex = 4;
btn_GlobalVar.Text = "鍏ㄥ眬鍙橀噺";
btn_GlobalVar.TextAlignment = StringAlignment.Center;
@@ -215,12 +208,12 @@
com_ProductName.DrawMode = DrawMode.OwnerDrawFixed;
com_ProductName.DropDownStyle = ComboBoxStyle.DropDownList;
com_ProductName.EnabledCalc = true;
+ com_ProductName.Font = new Font("瀹嬩綋", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
com_ProductName.FormattingEnabled = true;
com_ProductName.ItemHeight = 20;
- com_ProductName.Location = new Point(1252, 4);
- com_ProductName.Margin = new Padding(4);
+ com_ProductName.Location = new Point(1003, 3);
com_ProductName.Name = "com_ProductName";
- com_ProductName.Size = new Size(152, 26);
+ com_ProductName.Size = new Size(120, 26);
com_ProductName.TabIndex = 5;
com_ProductName.SelectedValueChanged += com_ProductName_SelectedValueChanged;
//
@@ -229,11 +222,10 @@
materialTabSelector.BaseTabControl = null;
materialTabSelector.Depth = 0;
materialTabSelector.Dock = DockStyle.Fill;
- materialTabSelector.Location = new Point(4, 4);
- materialTabSelector.Margin = new Padding(4);
+ materialTabSelector.Location = new Point(3, 3);
materialTabSelector.MouseState = MaterialSkin.MouseState.HOVER;
materialTabSelector.Name = "materialTabSelector";
- materialTabSelector.Size = new Size(1408, 52);
+ materialTabSelector.Size = new Size(1126, 42);
materialTabSelector.TabIndex = 1;
//
// grb_Info
@@ -244,11 +236,11 @@
grb_Info.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
grb_Info.ForeColor = SystemColors.Control;
grb_Info.Location = new Point(0, 0);
- grb_Info.Margin = new Padding(5, 6, 5, 6);
+ grb_Info.Margin = new Padding(4, 5, 4, 5);
grb_Info.MinimumSize = new Size(1, 1);
grb_Info.Name = "grb_Info";
- grb_Info.Padding = new Padding(0, 40, 0, 0);
- grb_Info.Size = new Size(1416, 180);
+ grb_Info.Padding = new Padding(0, 32, 0, 0);
+ grb_Info.Size = new Size(1132, 145);
grb_Info.TabIndex = 1;
grb_Info.Text = "鏃ュ織鏄剧ず鍖猴細";
grb_Info.TextAlignment = ContentAlignment.MiddleLeft;
@@ -258,13 +250,13 @@
rich_Info.Dock = DockStyle.Fill;
rich_Info.FillColor = Color.FromArgb(32, 41, 50);
rich_Info.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
- rich_Info.Location = new Point(0, 40);
+ rich_Info.Location = new Point(0, 32);
rich_Info.Margin = new Padding(4, 5, 4, 5);
rich_Info.MinimumSize = new Size(1, 1);
rich_Info.Name = "rich_Info";
rich_Info.Padding = new Padding(2);
rich_Info.ShowText = false;
- rich_Info.Size = new Size(1416, 140);
+ rich_Info.Size = new Size(1132, 113);
rich_Info.TabIndex = 0;
rich_Info.TextAlignment = ContentAlignment.MiddleLeft;
//
@@ -278,8 +270,7 @@
cb_VisionForm.EnableMaximizeButton = true;
cb_VisionForm.EnableMinimizeButton = true;
cb_VisionForm.ForeColor = Color.FromArgb(155, 155, 155);
- cb_VisionForm.Location = new Point(1315, 18);
- cb_VisionForm.Margin = new Padding(4);
+ cb_VisionForm.Location = new Point(1072, 14);
cb_VisionForm.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
cb_VisionForm.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
cb_VisionForm.Name = "cb_VisionForm";
@@ -289,14 +280,13 @@
//
// VisionForm
//
- AutoScaleDimensions = new SizeF(120F, 120F);
+ AutoScaleDimensions = new SizeF(96F, 96F);
AutoScaleMode = AutoScaleMode.Dpi;
- ClientSize = new Size(1440, 880);
+ ClientSize = new Size(1152, 704);
Controls.Add(theme_VisionForm);
FormBorderStyle = FormBorderStyle.None;
Icon = (Icon)resources.GetObject("$this.Icon");
- Margin = new Padding(4);
- MinimumSize = new Size(326, 76);
+ MinimumSize = new Size(261, 61);
Name = "VisionForm";
Text = "杞儙澶栬瑙嗚妫�娴嬬郴缁�";
TransparencyKey = Color.Fuchsia;
diff --git a/LB_SmartVision/VisionForm.resx b/LB_SmartVision/VisionForm.resx
index a47feae..5e25f3c 100644
--- a/LB_SmartVision/VisionForm.resx
+++ b/LB_SmartVision/VisionForm.resx
@@ -121,24 +121,24 @@
<data name="theme_VisionForm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAA+xJREFUWEftV0loFUkYbvcNFzJi0lWdBEPQruqXKEYdcRgz4AYqeplBwYiXEUVB
- UHAhCEG8iR509OBlmIsOjJ5EBvQSRVHzuvslxjAy8eCG+75GozF+f716L6873fqe2ykffDR59e9/1V8V
- ow99KARtUg72J5aypGNN8xy2yJPWcleylb5gS13HnJdy+KSW6uJx3b8ZA7TKl6PbMPq3SbMsBUcpyf/2
- BP8PDh96kr32BX/rS/4O30789grfO1j/k4LQ6p8POO6XdFgpDNbDSZsn2Bt8u2MpWGdKsCPeBNMm3TZp
- FaUc6/cW20pQEtpsflCllmwxjDbpLKOd9vAZuBPOx5J+86TyMdDbBxsdYLsn+SpUZYQy/imQILLdBIP3
- cxzEU7Dbns3WejXmcNK/NPGHkajabtUiLYO/nyOgXWdRFeUkDmdnWMOg2ACFFwEn8fzfFeaSxlpjIOlT
- EHC0HVm/CstSC13B93sVFaOVszDQpwGuYGtQLipnQDlMyLzH12t2zJ8adH/TbeMbVLYROmmyDvjYRrLK
- aS4Q3Y/gtWjFALtg6KSf4NW02Uj3HwSPzOuw9iAk24sI/p5rm3OV0wyOo+++ww7pzCIViVjvAk+02GyC
- VlWnpUmw2Qggn+AV0eZ/A61oEtYsOttRwjlE5vy4L61KrabQmjBtV3I/JPtRUptcmy9UBuiM+tLc+bHs
- aQ1Rn8rNnEC7Gpvr8KcqF0XoHVCbl0qB8p2OEspS8OZmySZrvwqNtbUDMRm3Yj9kj1uB9NXcwLkfjwyu
- RAhoshuYcHMyGy4DT5T+jKrcjNbJh+yW75QIw62yqhDAvUghwV/Cybrw5UKTDn08GqmTJ9GCx660pscG
- oPoq2MHzlUWjtN8skjZbRsGFdQpiJoBkVVkFnF3tLcCv+7ZZo31mcYZGLY5RL/kCiQrcaRLFTvrikOxc
- YJF2PeZ5ZsTmAkNkCtaiW1YAkcTF1sT4YjXFEM3ekMADz+YztM8AULqlqE5nSL5wor3Zkew51nxU4WnP
- Ij9DlVGLIWCtDhV6FzBWIJH9a3pNaZOGQRsNT6tjWSHB/6LK6OUA/ETJVER/O9dgwcQ7w7XLTG0yjSTO
- Onp7Ny3A92VuuTD0rbcFbXsUMJonaQwnBV8Rniu4y2sGYbEe5emA8cORV6ZGY3n5UNycC9AKvBHZZRh+
- iqxoX9BlRWMZozvLLiSEV5V6HT2Bjz9iX0ftaAWE9sDoBV+UlOufY9FeWTmE5OhdgLH8Kxyvhv5GON3q
- C3NzSvD19C70MTco4JTDZsbtrSzUlLP5DnBV3D745riOp5nr8F/OJcYV65++P2iTfNV/MPoQCcP4AKXR
- FGYxo/VGAAAAAElFTkSuQmCC
+ vAAADrwBlbxySQAAA+JJREFUWEftVkuIHGUQbt34iMEoq2S2q3p3yTJsuqpnJ+L6WBRdwaigohfFgEou
+ BkVBUPCBCEG8BXNQ48GLeImCehIJxMsqhsSZruod46K4HtSIGjU+4iOr0c1I9fSsM3/PLNtCPO0H36m/
+ evz/X11VnreKVRTAHPOZumkY6lFwqURws3BwZ8ywTQnuiCP/+iTCzY1qaUPzdm/Atf3PaHre6XPsjyQM
+ 2xLGV4XwIyX4QRj+UMK/lPFvJTyhBMeV8IgQvmRJuH4Ko+l5p9UjGBbCJ5RxTgj+VMZmXxKcSAjekHE/
+ NNs5DgaTKLinEQYVO4Trf1mkV81wixLUslPmA3bzF2XcKeP+hWY/u3n0fCXcrQwLyjAvjNsb1dI6N05P
+ mFAIHlHG73sEypPgGwnhfpn0zzH7jzddcK4Q7kqfKNMI4a9K+MwBDgbdeF04MBWsFYYdQvhbLlBvfhKT
+ f+vMtLfG7C0JJXxKGY67WnvCmPAFGRs7z42boul5AzHBfdK6TjdQtzPGk8oos5F/5Y7sfVvPhg+lp+1h
+ 0yIsxARPmtaN78WEl8eEX+SNclxUhne0glUrNrN9zfMGlPAuZTzaQ99FYfwuDv3ruoLvq5bWaQSvZCfL
+ GXUYLwrj240Qxtu2lkSN4FpdWfKZH9jb9RQ1Cq62f9sVOlxUxn3KQXnJ0PO8QxU/jBm1h74v7ZniEG9K
+ Hdg/quzvXO709k0Y3u08ucGqWgheX862H4XgxbR47SqU8D1X0EXC2VmGizqDz0xPr0kYH9eO360gNe0b
+ jWppozB+1kOQEb5MCLa0C64NoeGrhOGrvH6lhK81GiIvnggmrDLzgvTkvwvDA+5wsU4nhG/m9AUoBD/F
+ HFzWN4H0XQn2vF8eXN8Z3FAPYasl59oUYjuB+sTImDB+nhfgYQ39STf4fmu1DHtz+oIUgiM1KkWtwcFw
+ sOujVT3hrnaL7UQc+hcL5W+sKIXhw0OVjaW0iwnBc47gqIQ45QY32PKRzv8eTguRYM9SS5YouEEZjv37
+ EffbzbjBDdZyxZYQ12EB2qS0bWrJqRVazPDWkojwZbuZrsgZtDJ0iY1g12khEtTicMTvclwn2CKE32YJ
+ 7G5PORfZ1HtMCH7MOV4BrQ3XCe92+4onk5Nn2PolDAvWXnuOzAwzo6Nnx4Q3SrojwqfKeMxWMpsXWVs+
+ 2WrfKRdbW1W6Hf0shM/33Y7my4PrleFZIfhAaWjU/e5ivlw+y3S2FySMtynjvcrwsFiLJv/RhPBB2ws1
+ hK2WcBLBFf1qawlplwvxaQlxe786OOU4PBWsjSO85mBlQ8n99r/BisSdAas4FfgHpdEUZpwUX7sAAAAA
+ SUVORK5CYII=
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--
Gitblit v1.9.3