sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Apply newline additions

Browse Source
This commit is contained in:
Dean Herbert
2019-04-01 12:16:05 +09:00
parent 7d6a08d6da
commit 612db31c38
108 changed files with 359 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
View File

@ -34,6 +34,7 @@ namespace osu.Game.Graphics.Containers
protected override void Update()
{
base.Update();
if (InternalChildren.Count > 0 && InternalChild.DrawSize.X > 0)
{
// We're modifying scale here for a few reasons

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

@ -51,6 +51,7 @@ namespace osu.Game.Graphics.Containers
}
int previousLinkEnd = 0;
foreach (var link in links)
{
AddText(text.Substring(previousLinkEnd, link.Index - previousLinkEnd));
@ -90,10 +91,12 @@ namespace osu.Game.Graphics.Containers
if (linkArgument != null && int.TryParse(linkArgument.Contains('?') ? linkArgument.Split('?')[0] : linkArgument, out int beatmapId))
game?.ShowBeatmap(beatmapId);
break;
case LinkAction.OpenBeatmapSet:
if (int.TryParse(linkArgument, out int setId))
game?.ShowBeatmapSet(setId);
break;
case LinkAction.OpenChannel:
try
{
@ -105,18 +108,22 @@ namespace osu.Game.Graphics.Containers
}
break;
case LinkAction.OpenEditorTimestamp:
case LinkAction.JoinMultiplayerMatch:
case LinkAction.Spectate:
showNotImplementedError?.Invoke();
break;
case LinkAction.External:
game?.OpenUrlExternally(url);
break;
case LinkAction.OpenUserProfile:
if (long.TryParse(linkArgument, out long userId))
game?.ShowUser(userId);
break;
default:
throw new NotImplementedException($"This {nameof(LinkAction)} ({linkType.ToString()}) is missing an associated action.");
}

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

@ -150,6 +150,7 @@ namespace osu.Game.Graphics.Containers
float headerH = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
float footerH = Footer?.LayoutSize.Y ?? 0;
if (headerH != headerHeight || footerH != footerHeight)
{
headerHeight = headerH;
@ -181,6 +182,7 @@ namespace osu.Game.Graphics.Containers
foreach (var section in Children)
{
float diff = Math.Abs(scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset);
if (diff < minDiff)
{
minDiff = diff;