diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx.cs b/插件库/Lskj.Main/Control/MainPanelControlEx.cs index c2df08d..f920331 100644 --- a/插件库/Lskj.Main/Control/MainPanelControlEx.cs +++ b/插件库/Lskj.Main/Control/MainPanelControlEx.cs @@ -690,6 +690,12 @@ namespace Lskj.Main.Control int buttonWidth = Convert.ToInt32(0.44 * DpiX), buttonHeight = Convert.ToInt32(0.44 * DpiY); // 模块宽度,模块高度 //int centerWidth = pl_center_main.Width - pl_center_main_right.Width; // 内容区域宽度-右侧快捷栏宽度 int centerWidth = pl_center_main_middle.Width; // 内容区域宽度 + if (this.splitMainControl.Panel2Collapsed) + { + this.splitMainControl.Panel2Collapsed = false; + centerWidth = pl_center_main_middle.Width; + this.splitMainControl.Panel2Collapsed = true; + } string defaultParentMenu = string.Empty; MenuBar.ButtonHoverEventHandler hoverEvent = null; hoverEvent += new MenuBar.ButtonHoverEventHandler(OnTriggerMenu); @@ -1252,7 +1258,7 @@ namespace Lskj.Main.Control menu.Location = new Point(menuLeft, menuTop); menuLeft += Convert.ToInt32(1.20 * DpiX); // 换行显示 - if (menuLeft + menuWidth > centerWidth) + if (menuLeft + menuWidthOld > centerWidth) { menuLeft = 5; menuTop += menuHeightOld;