From a606f41297931301e66225c6ada60cf5fa6b326b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 28 May 2020 22:25:00 +0900
Subject: [PATCH] Add button to open results

---
 .../TestSceneTimeshiftResultsScreen.cs        | 14 ++++++--
 .../Screens/Multi/Match/MatchSubScreen.cs     | 33 +++++++++++++++++--
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  2 +-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
index 7f43aea56e..d87a2e3408 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
@@ -19,9 +19,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneTimeshiftResultsScreen : ScreenTestScene
     {
         [Test]
-        public void TestShowResults()
+        public void TestShowResultsWithScore()
+        {
+            createResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+        }
+
+        [Test]
+        public void TestShowResultsNullScore()
+        {
+            createResults(null);
+        }
+
+        private void createResults(ScoreInfo score)
         {
-            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
             var roomScores = new List<RoomScore>();
 
             for (int i = 0; i < 10; i++)
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index c37f51bcb4..01a90139c3 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
@@ -18,6 +20,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Select;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
@@ -114,10 +117,29 @@ namespace osu.Game.Screens.Multi.Match
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Padding = new MarginPadding { Horizontal = 5 },
-                                                                Child = new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                                Child = new GridContainer
                                                                 {
                                                                     RelativeSizeAxes = Axes.Both,
-                                                                    SelectedItem = { BindTarget = SelectedItem }
+                                                                    Content = new[]
+                                                                    {
+                                                                        new Drawable[]
+                                                                        {
+                                                                            new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.Both,
+                                                                                SelectedItem = { BindTarget = SelectedItem }
+                                                                            }
+                                                                        },
+                                                                        new Drawable[]
+                                                                        {
+                                                                            new TriangleButton
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                Text = "Show beatmap results",
+                                                                                Action = showBeatmapResults
+                                                                            }
+                                                                        }
+                                                                    }
                                                                 }
                                                             },
                                                             new Container
@@ -257,5 +279,12 @@ namespace osu.Game.Screens.Multi.Match
                     break;
             }
         }
+
+        private void showBeatmapResults()
+        {
+            Debug.Assert(roomId.Value != null);
+
+            this.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, SelectedItem.Value, false));
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 60cffc06df..f2afe15d35 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multi.Ranking
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID);
-            req.Success += r => scoresCallback?.Invoke(r.Select(s => s.CreateScoreInfo(playlistItem)));
+            req.Success += r => scoresCallback?.Invoke(r.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
             return req;
         }
     }