Merge branch 'Tryibion-CM-fix-open-left'

2022-10-23 23:49:58 +02:00
parent 5cff11ce4a b7b31aad8e
commit 1ef16fde92
1 changed files with 10 additions and 2 deletions
@@ -155,11 +155,19 @@ namespace FlaxEditor.GUI.ContextMenu
                    if (parent is ContextMenu menu && menu._childCM != null)
                        locationSS.Y += 30.0f * dpiScale;
                }
-                if (monitorBounds.Right < rightBottomLocationSS.X)
+                if (monitorBounds.Right < rightBottomLocationSS.X || _parentCM?.Direction == ContextMenuDirection.LeftDown || _parentCM?.Direction == ContextMenuDirection.LeftUp)
                {
                    // Direction: left
                    isLeft = true;
-                    locationSS.X -= dpiSize.X;
+
+                    if (IsSubMenu && _parentCM != null)
+                    {
+                        locationSS.X -= _parentCM.Width + dpiSize.X;
+                    }
+                    else
+                    {
+                        locationSS.X -= dpiSize.X;
+                    }
                }
            }