Skip to content

Add support for nested SubMenus #1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SnipUndercover merged 2 commits into from
Jun 28, 2026
+44 −14
Merged

Add support for nested SubMenus #1005

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
377d1d5
feat: nested SubMenus
ACherryJam Dec 3, 2025
7925f4e
Clear Parent on SubMenu removal and fix height cache invalidation issues
Wartori54 Jun 23, 2026
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
54 changes: 40 additions & 14 deletions Celeste.Mod.mm/Mod/UI/TextMenuExt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,6 @@ public override void Render(Vector2 position, bool highlighted) {

/// <summary>
/// <see cref="TextMenu.Item"/> that acts as a Submenu for other Items.
/// <br/><br/>
/// Currently does not support recursive submenus
/// </summary>
public class SubMenu : patch_Item {
public string Label;
Expand Down Expand Up @@ -507,13 +505,15 @@ public float ScrollTargetY {
public float MenuHeight { get; private set; }

public bool Focused;
public bool AutoScroll;

public bool ItemsVisible;
public SubMenu Parent = null;

private bool enterOnSelect;
private bool entering;
private float ease;

private bool containerAutoScroll;

/// <summary>
/// Create a new SubMenu.
/// </summary>
Expand Down Expand Up @@ -558,6 +558,8 @@ public SubMenu Add(TextMenu.Item item) {
if (Container != null) {
Items.Add(item);
item.Container = Container;
if (item is SubMenu menu)
menu.Parent = this;
Container.Add(item.ValueWiggler = Wiggler.Create(0.25f, 3f, null, false, false));
Container.Add(item.SelectWiggler = Wiggler.Create(0.25f, 3f, null, false, false));
item.ValueWiggler.UseRawDeltaTime = (item.SelectWiggler.UseRawDeltaTime = true);
Expand All @@ -580,6 +582,8 @@ public SubMenu Insert(int index, TextMenu.Item item) {
if (Container != null) {
Items.Insert(index, item);
item.Container = Container;
if (item is SubMenu menu)
menu.Parent = this;
Container.Add(item.ValueWiggler = Wiggler.Create(0.25f, 3f, null, false, false));
Container.Add(item.SelectWiggler = Wiggler.Create(0.25f, 3f, null, false, false));
item.ValueWiggler.UseRawDeltaTime = (item.SelectWiggler.UseRawDeltaTime = true);
Expand Down Expand Up @@ -663,7 +667,11 @@ public void MoveSelection(int direction, bool wiggle = false) {
// Avoid crash when getting Current item
Selection = selection;
Exit();
Container.MoveSelection(direction, true);
if (Parent is null) {
Container.MoveSelection(direction, true);
} else {
Parent.MoveSelection(direction, true);
}
return;
}
}
Expand Down Expand Up @@ -722,7 +730,8 @@ public void RecalculateSize() {

/// <inheritdoc cref="TextMenu.GetYOffsetOf(TextMenu.Item)"/>
public float GetYOffsetOf(TextMenu.Item item) {
float offset = Container.GetYOffsetOf(this) - Height() * 0.5f;
float y_offset = Parent is not null ? Parent.GetYOffsetOf(this) : Container.GetYOffsetOf(this);
float offset = y_offset - Height() * 0.5f;
if (item == null) {
// common case is all items in submenu are disabled when item is null
return offset + TitleHeight * 0.5f;
Expand All @@ -742,10 +751,17 @@ public float GetYOffsetOf(TextMenu.Item item) {
public void Exit() {
Current?.OnLeave?.Invoke();
Focused = false;
ItemsVisible = false;
if (!Input.MenuUp.Repeating && !Input.MenuDown.Repeating)
Audio.Play(SFX.ui_main_button_back);
Container.AutoScroll = containerAutoScroll;
Container.Focused = true;

if (Parent is null) {
Container.AutoScroll = AutoScroll;
Container.Focused = true;
} else {
Parent.AutoScroll = AutoScroll;
Parent.Focused = true;
}
}

public override string SearchLabel() {
Expand All @@ -758,10 +774,20 @@ public override string SearchLabel() {

public override void ConfirmPressed() {
if (Items.Count > 0) {
Container.Focused = false;
if (Parent is null)
Container.Focused = false;
else
Parent.Focused = false;
Focused = true;
containerAutoScroll = Container.AutoScroll;
Container.AutoScroll = false;
ItemsVisible = true;

if (Parent is null) {
AutoScroll = Container.AutoScroll;
Container.AutoScroll = false;
} else {
AutoScroll = Parent.AutoScroll;
Parent.AutoScroll = false;
}

entering = true;
if (Input.MenuUp.Pressed)
Expand Down Expand Up @@ -800,7 +826,7 @@ public override void Added() {
}

public override void Update() {
if (Focused)
if (ItemsVisible)
ease = Calc.Approach(ease, 1f, Engine.RawDeltaTime * 4f);
else
ease = Calc.Approach(ease, 0f, Engine.RawDeltaTime * 4f);
Expand Down Expand Up @@ -850,7 +876,7 @@ public override void Update() {
}
}

if (Focused && containerAutoScroll) {
if (Focused && AutoScroll) {
if (Container.Height > Container.ScrollableMinSize) {
Container.Position.Y += (ScrollTargetY - Container.Position.Y) * (1f - (float) Math.Pow(0.01f, Engine.RawDeltaTime));
return;
Expand All @@ -874,7 +900,7 @@ public override void Render(Vector2 position, bool highlighted) {
SubMenu.DrawIcon(titlePosition, Icon, iconJustify, true, (Disabled || Items.Count < 1 ? Color.DarkSlateGray : (Focused ? Container.HighlightColor : Color.White)) * alpha, 0.8f);
ActiveFont.DrawOutline(Label, titlePosition, justify, Vector2.One, color, 2f, strokeColor);

if (Focused && ease > 0.9f) {
if (ItemsVisible && ease > 0.9f) {
Vector2 menuPosition = new Vector2(top.X + ItemIndent, top.Y + TitleHeight + ItemSpacing);
RecalculateSize();
foreach (TextMenu.Item item in Items) {
Expand Down