Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Intersect.Client.Framework/Gwen/Control/ComboBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,8 @@ private static void Open(ComboBox @this)
var menuItems = @this._menu.Children.OfType<MenuItem>().ToArray();
foreach (var menuItem in menuItems)
{
menuItem.SizeToContents();
menuItem.AutoSizeToContents = false;
totalChildHeight += menuItem.OuterHeight;
// TODO(2553): I thought this was the solution, it isn't. Results in menu growing each time it's opened.
// width = Math.Max(width, menuItem.OuterWidth + menuPaddingH);
}

var offset = @this.ToCanvas(default);
Expand Down
22 changes: 1 addition & 21 deletions Intersect.Client.Framework/Gwen/Control/ContextMenu.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
namespace Intersect.Client.Framework.Gwen.Control;

public class ContextMenu : Menu
{
public ContextMenu(Base parent, string? name = default) : base(parent, name)
{

}

protected override void OnPositioningBeforeOpen()
{
base.OnPositioningBeforeOpen();

SizeToChildren(recursive: true);
}

protected override void OnOpen()
{
base.OnOpen();

PostLayout.Enqueue(contextMenu => contextMenu.SizeToChildren(recursive: true), this);
}
}
public class ContextMenu(Base parent, string? name = default) : Menu(parent, name);
6 changes: 6 additions & 0 deletions Intersect.Client.Framework/Gwen/Control/Menu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,13 @@ private static void Open(Menu @this, Pos position)

protected virtual void OnPositioningBeforeOpen()
{
var menuItems = Children.OfType<MenuItem>().ToArray();
foreach (var menuItem in menuItems)
{
menuItem.AutoSizeToContents = false;
}

SizeToChildren(recursive: true);
}

protected virtual void OnOpen()
Expand Down
Loading