mirror of
https://github.com/ppy/osu.git
synced 2025-02-07 23:32:56 +08:00
Merge pull request #29067 from bdach/report-daily-challenge
Fix not being able to send chat reports on daily challenge screen
This commit is contained in:
Dean Herbert
GitHub
commit
6cc3e8aab8
@ -13,6 +13,7 @@ using osu.Framework.Extensions.LocalisationExtensions;
|
|||||||
using osu.Framework.Extensions.ObjectExtensions;
|
using osu.Framework.Extensions.ObjectExtensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Cursor;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.Logging;
|
using osu.Framework.Logging;
|
||||||
using osu.Framework.Screens;
|
using osu.Framework.Screens;
|
||||||
@ -126,169 +127,173 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
|
|||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
},
|
},
|
||||||
new Header(ButtonSystemStrings.DailyChallenge.ToSentence(), null),
|
new Header(ButtonSystemStrings.DailyChallenge.ToSentence(), null),
|
||||||
new GridContainer
|
new PopoverContainer
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Padding = new MarginPadding
|
Child = new GridContainer
|
||||||
{
|
{
|
||||||
Horizontal = WaveOverlayContainer.WIDTH_PADDING,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Top = Header.HEIGHT,
|
Padding = new MarginPadding
|
||||||
},
|
|
||||||
RowDimensions =
|
|
||||||
[
|
|
||||||
new Dimension(GridSizeMode.AutoSize),
|
|
||||||
new Dimension(GridSizeMode.Absolute, 10),
|
|
||||||
new Dimension(),
|
|
||||||
new Dimension(GridSizeMode.Absolute, 30),
|
|
||||||
new Dimension(GridSizeMode.Absolute, 50)
|
|
||||||
],
|
|
||||||
Content = new[]
|
|
||||||
{
|
|
||||||
new Drawable[]
|
|
||||||
{
|
{
|
||||||
new DrawableRoomPlaylistItem(playlistItem)
|
Horizontal = WaveOverlayContainer.WIDTH_PADDING,
|
||||||
{
|
Top = Header.HEIGHT,
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AllowReordering = false,
|
|
||||||
Scale = new Vector2(1.4f),
|
|
||||||
Width = 1 / 1.4f,
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
null,
|
RowDimensions =
|
||||||
[
|
[
|
||||||
new Container
|
new Dimension(GridSizeMode.AutoSize),
|
||||||
|
new Dimension(GridSizeMode.Absolute, 10),
|
||||||
|
new Dimension(),
|
||||||
|
new Dimension(GridSizeMode.Absolute, 30),
|
||||||
|
new Dimension(GridSizeMode.Absolute, 50)
|
||||||
|
],
|
||||||
|
Content = new[]
|
||||||
|
{
|
||||||
|
new Drawable[]
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
new DrawableRoomPlaylistItem(playlistItem)
|
||||||
Masking = true,
|
|
||||||
CornerRadius = 10,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
{
|
||||||
new Box
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AllowReordering = false,
|
||||||
|
Scale = new Vector2(1.4f),
|
||||||
|
Width = 1 / 1.4f,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
null,
|
||||||
|
[
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Masking = true,
|
||||||
|
CornerRadius = 10,
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
new Box
|
||||||
Colour = colourProvider.Background4,
|
|
||||||
},
|
|
||||||
new GridContainer
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Padding = new MarginPadding(10),
|
|
||||||
ColumnDimensions =
|
|
||||||
[
|
|
||||||
new Dimension(),
|
|
||||||
new Dimension(GridSizeMode.Absolute, 10),
|
|
||||||
new Dimension(),
|
|
||||||
new Dimension(GridSizeMode.Absolute, 10),
|
|
||||||
new Dimension()
|
|
||||||
],
|
|
||||||
Content = new[]
|
|
||||||
{
|
{
|
||||||
new Drawable?[]
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = colourProvider.Background4,
|
||||||
|
},
|
||||||
|
new GridContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Padding = new MarginPadding(10),
|
||||||
|
ColumnDimensions =
|
||||||
|
[
|
||||||
|
new Dimension(),
|
||||||
|
new Dimension(GridSizeMode.Absolute, 10),
|
||||||
|
new Dimension(),
|
||||||
|
new Dimension(GridSizeMode.Absolute, 10),
|
||||||
|
new Dimension()
|
||||||
|
],
|
||||||
|
Content = new[]
|
||||||
{
|
{
|
||||||
new GridContainer
|
new Drawable?[]
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
new GridContainer
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
RowDimensions =
|
|
||||||
[
|
|
||||||
new Dimension(),
|
|
||||||
new Dimension()
|
|
||||||
],
|
|
||||||
Content = new[]
|
|
||||||
{
|
{
|
||||||
new Drawable[]
|
RelativeSizeAxes = Axes.Both,
|
||||||
{
|
Anchor = Anchor.Centre,
|
||||||
new DailyChallengeCarousel
|
Origin = Anchor.Centre,
|
||||||
{
|
RowDimensions =
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new DailyChallengeTimeRemainingRing(),
|
|
||||||
breakdown = new DailyChallengeScoreBreakdown(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
[
|
[
|
||||||
feed = new DailyChallengeEventFeed
|
new Dimension(),
|
||||||
{
|
new Dimension()
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
PresentScore = presentScore
|
|
||||||
}
|
|
||||||
],
|
],
|
||||||
},
|
Content = new[]
|
||||||
},
|
|
||||||
null,
|
|
||||||
// Middle column (leaderboard)
|
|
||||||
leaderboard = new DailyChallengeLeaderboard(room, playlistItem)
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
PresentScore = presentScore,
|
|
||||||
},
|
|
||||||
// Spacer
|
|
||||||
null,
|
|
||||||
// Main right column
|
|
||||||
new GridContainer
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Content = new[]
|
|
||||||
{
|
|
||||||
new Drawable[]
|
|
||||||
{
|
{
|
||||||
new SectionHeader("Chat")
|
new Drawable[]
|
||||||
|
{
|
||||||
|
new DailyChallengeCarousel
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new DailyChallengeTimeRemainingRing(),
|
||||||
|
breakdown = new DailyChallengeScoreBreakdown(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[
|
||||||
|
feed = new DailyChallengeEventFeed
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
PresentScore = presentScore
|
||||||
|
}
|
||||||
|
],
|
||||||
},
|
},
|
||||||
[new MatchChatDisplay(room) { RelativeSizeAxes = Axes.Both }]
|
|
||||||
},
|
},
|
||||||
RowDimensions =
|
null,
|
||||||
[
|
// Middle column (leaderboard)
|
||||||
new Dimension(GridSizeMode.AutoSize),
|
leaderboard = new DailyChallengeLeaderboard(room, playlistItem)
|
||||||
new Dimension()
|
{
|
||||||
]
|
RelativeSizeAxes = Axes.Both,
|
||||||
},
|
PresentScore = presentScore,
|
||||||
|
},
|
||||||
|
// Spacer
|
||||||
|
null,
|
||||||
|
// Main right column
|
||||||
|
new GridContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Content = new[]
|
||||||
|
{
|
||||||
|
new Drawable[]
|
||||||
|
{
|
||||||
|
new SectionHeader("Chat")
|
||||||
|
},
|
||||||
|
[new MatchChatDisplay(room) { RelativeSizeAxes = Axes.Both }]
|
||||||
|
},
|
||||||
|
RowDimensions =
|
||||||
|
[
|
||||||
|
new Dimension(GridSizeMode.AutoSize),
|
||||||
|
new Dimension()
|
||||||
|
]
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
],
|
||||||
],
|
null,
|
||||||
null,
|
[
|
||||||
[
|
new Container
|
||||||
new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Padding = new MarginPadding
|
|
||||||
{
|
{
|
||||||
Horizontal = -WaveOverlayContainer.WIDTH_PADDING,
|
RelativeSizeAxes = Axes.Both,
|
||||||
},
|
Padding = new MarginPadding
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new Box
|
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
Horizontal = -WaveOverlayContainer.WIDTH_PADDING,
|
||||||
Colour = colourProvider.Background5,
|
|
||||||
},
|
},
|
||||||
footerButtons = new FillFlowContainer
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
new Box
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
Padding = new MarginPadding(5),
|
|
||||||
Spacing = new Vector2(10),
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
{
|
||||||
new PlaylistsReadyButton
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = colourProvider.Background5,
|
||||||
|
},
|
||||||
|
footerButtons = new FillFlowContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Padding = new MarginPadding(5),
|
||||||
|
Spacing = new Vector2(10),
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
Anchor = Anchor.Centre,
|
new PlaylistsReadyButton
|
||||||
Origin = Anchor.Centre,
|
{
|
||||||
RelativeSizeAxes = Axes.Y,
|
Anchor = Anchor.Centre,
|
||||||
Size = new Vector2(250, 1),
|
Origin = Anchor.Centre,
|
||||||
Action = startPlay
|
RelativeSizeAxes = Axes.Y,
|
||||||
|
Size = new Vector2(250, 1),
|
||||||
|
Action = startPlay
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
}
|
],
|
||||||
],
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user