From 1ffb16976522266280532ed5afe68c624c79beba Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Sat, 20 Jun 2020 21:02:03 +0200 Subject: [PATCH] [BUG] submenu wrong location (#97) --- Business/Menus.cs | 5 ++--- Business/WaitToLoadMenu.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Business/Menus.cs b/Business/Menus.cs index 54d6450..c59fdb3 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -668,8 +668,7 @@ namespace SystemTrayMenu.Business menu.Padding.Horizontal + menuPredecessor.Width); if (directionToRight) { - if (widthPredecessors - menu.Width <= - -menu.Padding.Horizontal) + if (widthPredecessors - menus[0].Width - menu.Width < 0) { directionToRight = false; } @@ -679,7 +678,7 @@ namespace SystemTrayMenu.Business } } else if (Statics.ScreenWidth < - widthPredecessors + menuPredecessor.Width + menu.Width) + widthPredecessors + menus[0].Width + menu.Width) { directionToRight = true; widthPredecessors -= newWith; diff --git a/Business/WaitToLoadMenu.cs b/Business/WaitToLoadMenu.cs index cc5dff9..05965d0 100644 --- a/Business/WaitToLoadMenu.cs +++ b/Business/WaitToLoadMenu.cs @@ -121,7 +121,7 @@ namespace SystemTrayMenu.Handler rowData.MenuLevel = menu.Level; if (!rowData.IsContextMenuOpen && rowData.ContainsMenu && - rowData.MenuLevel < MenuDefines.MenusMax) + rowData.MenuLevel + 1 < MenuDefines.MenusMax) { StartLoadMenu.Invoke(rowData); }