RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-17 04:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22268 from Feodor0090/comments-margin

Browse Source 
Reduce padding for too nested comments
This commit is contained in:
Dean Herbert 2023-01-18 11:45:41 +09:00 committed by GitHub
commit 0a47dc733f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/Comments/DrawableComment.cs
View File

@ -57,6 +57,11 @@ namespace osu.Game.Overlays.Comments
/// </summary>
public bool WasDeleted { get; protected set; }
/// <summary>
/// Tracks this comment's level of nesting. 0 means that this comment has no parents.
/// </summary>
public int Level { get; private set; }
private FillFlowContainer childCommentsVisibilityContainer = null!;
private FillFlowContainer childCommentsContainer = null!;
private LoadRepliesButton loadRepliesButton = null!;
@ -70,7 +75,7 @@ namespace osu.Game.Overlays.Comments
private GridContainer content = null!;
private VotePill votePill = null!;
[Resolved(canBeNull: true)]
[Resolved]
private IDialogOverlay? dialogOverlay { get; set; }
[Resolved]
@ -79,7 +84,7 @@ namespace osu.Game.Overlays.Comments
[Resolved]
private GameHost host { get; set; } = null!;
[Resolved(canBeNull: true)]
[Resolved]
private OnScreenDisplay? onScreenDisplay { get; set; }
public DrawableComment(Comment comment)
@ -88,12 +93,16 @@ namespace osu.Game.Overlays.Comments
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
private void load(OverlayColourProvider colourProvider, DrawableComment? parentComment)
{
LinkFlowContainer username;
FillFlowContainer info;
CommentMarkdownContainer message;
Level = parentComment?.Level + 1 ?? 0;
float childrenPadding = Level < 6 ? 20 : 5;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
InternalChildren = new Drawable[]
@ -248,7 +257,7 @@ namespace osu.Game.Overlays.Comments
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Padding = new MarginPadding { Left = 20 },
Padding = new MarginPadding { Left = childrenPadding },
Children = new Drawable[]
{
childCommentsContainer = new FillFlowContainer