sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_progress_bar_info

Browse Source
This commit is contained in:
Dean Herbert
2022-09-09 17:34:13 +09:00
committed by GitHub
parent bc5340e33a 1b0edaead2
commit 27f745b980
183 changed files with 2708 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Graphics/Containers/SectionsContainer.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Graphics.Containers
if (value == expandableHeader) return;
if (expandableHeader != null)
RemoveInternal(expandableHeader);
RemoveInternal(expandableHeader, false);
expandableHeader = value;
@ -55,6 +55,7 @@ namespace osu.Game.Graphics.Containers
fixedHeader?.Expire();
fixedHeader = value;
if (value == null) return;
AddInternal(fixedHeader);
@ -70,8 +71,10 @@ namespace osu.Game.Graphics.Containers
if (value == footer) return;
if (footer != null)
scrollContainer.Remove(footer);
scrollContainer.Remove(footer, false);
footer = value;
if (value == null) return;
footer.Anchor |= Anchor.y2;

2
osu.Game/Graphics/Containers/SelectionCycleFillFlowContainer.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Graphics.Containers
drawable.StateChanged += state => selectionChanged(drawable, state);
}
public override bool Remove(T drawable)
public override bool Remove(T drawable, bool disposeImmediately)
=> throw new NotSupportedException($"Cannot remove drawables from {nameof(SelectionCycleFillFlowContainer<T>)}");
private void setSelected(int? value)