h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 15:03:13 +08:00
Code Issues Releases Wiki Activity

Fix typos and visuals

Browse Source
This commit is contained in:
Dean Herbert 2024-07-29 20:16:41 +09:00
parent 5ec46a79b4
commit 997b3eb498
No known key found for this signature in database
3 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Online/TestSceneDrawableChannel.cs
View File

@ -115,7 +115,7 @@ namespace osu.Game.Tests.Visual.Online
AddRepeatStep("check background", () =>
{
// +1 because the day separator take one index
Assert.AreEqual((checkCount + 1) % 2 == 0, drawableChannel.ChildrenOfType<ChatLine>().ToList()[checkCount].AlteringBackground);
Assert.AreEqual((checkCount + 1) % 2 == 0, drawableChannel.ChildrenOfType<ChatLine>().ToList()[checkCount].AlternatingBackground);
checkCount++;
}, 10);
}

126
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -70,14 +70,14 @@ namespace osu.Game.Overlays.Chat
private Drawable? background;
private bool alteringBackground;
private bool alternatingBackground;
public bool AlteringBackground
public bool AlternatingBackground
{
get => alteringBackground;
get => alternatingBackground;
set
{
alteringBackground = value;
alternatingBackground = value;
updateBackground();
}
}
@ -115,53 +115,70 @@ namespace osu.Game.Overlays.Chat
configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
prefer24HourTime.BindValueChanged(_ => updateTimestamp());
InternalChild = new GridContainer
InternalChildren = new[]
{
Margin = new MarginPadding
background = new Container
{
Horizontal = 10,
Vertical = 1,
},
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
ColumnDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.Absolute, Spacing + UsernameWidth + Spacing),
new Dimension(),
},
Content = new[]
{
new Drawable[]
Masking = true,
Blending = BlendingParameters.Additive,
CornerRadius = 4,
RelativeSizeAxes = Axes.Both,
Child = new Box
{
drawableTimestamp = new OsuSpriteText
{
Shadow = false,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
AlwaysPresent = true,
},
drawableUsername = new DrawableChatUsername(message.Sender)
{
Width = UsernameWidth,
FontSize = FontSize,
AutoSizeAxes = Axes.Y,
Origin = Anchor.TopRight,
Anchor = Anchor.TopRight,
Margin = new MarginPadding { Horizontal = Spacing },
AccentColour = UsernameColour,
Inverted = !string.IsNullOrEmpty(message.Sender.Colour),
},
drawableContentFlow = new LinkFlowContainer(styleMessageContent)
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
}
Colour = Color4.White,
RelativeSizeAxes = Axes.Both,
},
},
new GridContainer
{
Margin = new MarginPadding
{
Horizontal = 10,
Vertical = 1,
},
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
ColumnDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.Absolute, Spacing + UsernameWidth + Spacing),
new Dimension(),
},
Content = new[]
{
new Drawable[]
{
drawableTimestamp = new OsuSpriteText
{
Shadow = false,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: FontSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
AlwaysPresent = true,
},
drawableUsername = new DrawableChatUsername(message.Sender)
{
Width = UsernameWidth,
FontSize = FontSize,
AutoSizeAxes = Axes.Y,
Origin = Anchor.TopRight,
Anchor = Anchor.TopRight,
Margin = new MarginPadding { Horizontal = Spacing },
AccentColour = UsernameColour,
Inverted = !string.IsNullOrEmpty(message.Sender.Colour),
},
drawableContentFlow = new LinkFlowContainer(styleMessageContent)
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
}
},
}
}
};
updateBackground();
}
protected override void LoadComplete()
@ -279,23 +296,8 @@ namespace osu.Game.Overlays.Chat
private void updateBackground()
{
if (alteringBackground)
{
if (background?.IsAlive != true)
{
AddInternal(background = new Circle
{
MaskingSmoothness = 2.5f,
Depth = float.MaxValue,
RelativeSizeAxes = Axes.Both,
Colour = Color4.White,
});
}
background.Alpha = 0.04f;
}
else
background?.Expire();
if (background != null)
background.Alpha = alternatingBackground ? 0.03f : 0;
}
}
}

6
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -104,13 +104,13 @@ namespace osu.Game.Overlays.Chat
highlightedMessage.Value = null;
});
private void processChatlineBackgroundAltering()
private void updateBackgroundAlternating()
{
for (int i = 0; i < ChatLineFlow.Count; i++)
{
if (ChatLineFlow[i] is ChatLine chatline)
{
chatline.AlteringBackground = i % 2 == 0;
chatline.AlternatingBackground = i % 2 == 0;
}
}
}
@ -169,7 +169,7 @@ namespace osu.Game.Overlays.Chat
scroll.ScrollToEnd();
processMessageHighlighting();
processChatlineBackgroundAltering();
updateBackgroundAlternating();
});
private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>