From bf1bb3267420e64400d8991c34bb2b65f026c9c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Aug 2020 19:06:58 +0900
Subject: [PATCH 1/2] Add missing toolbar tooltips for right-hand icons

---
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs      | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarChatButton.cs           | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs          | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs           | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs       | 2 ++
 osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs         | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index eecb368ee9..3c38fdd207 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarBeatmapListingButton()
         {
             SetIcon(OsuIcon.ChevronDownCircle);
+            TooltipMain = "Beatmap Listing";
+            TooltipSub = "Browse for new beatmaps";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index 84210e27a4..c88b418853 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarChangelogButton()
         {
             SetIcon(FontAwesome.Solid.Bullhorn);
+            TooltipMain = "Changelog";
+            TooltipSub = "Track recent dev updates in the osu! ecosystem";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
index ad0e5be551..ec7da54571 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarChatButton()
         {
             SetIcon(FontAwesome.Solid.Comments);
+            TooltipMain = "Chat";
+            TooltipSub = "Join the real-time discussion";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
index b29aec5842..712da12208 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarMusicButton()
         {
             Icon = FontAwesome.Solid.Music;
+            TooltipMain = "Now playing";
+            TooltipSub = "Manage the currently playing track";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
index e813a3f4cb..106c67a041 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarNewsButton()
         {
             Icon = FontAwesome.Solid.Newspaper;
+            TooltipMain = "News";
+            TooltipSub = "Get up-to-date on community happenings";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
index cbd097696d..c026ce99fe 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarRankingsButton()
         {
             SetIcon(FontAwesome.Regular.ChartBar);
+            TooltipMain = "Ranking";
+            TooltipSub = "Find out who's the best right now";
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index f6646eb81d..0dbb552c15 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarSocialButton()
         {
             Icon = FontAwesome.Solid.Users;
+            TooltipMain = "Friends";
+            TooltipSub = "Interact with those close to you";
         }
 
         [BackgroundDependencyLoader(true)]

From e3f314349abc74ebc3ef6e1774045325fd763a75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Aug 2020 12:27:30 +0900
Subject: [PATCH 2/2] Don't use title case

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index 3c38fdd207..64430c77ac 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Toolbar
         public ToolbarBeatmapListingButton()
         {
             SetIcon(OsuIcon.ChevronDownCircle);
-            TooltipMain = "Beatmap Listing";
+            TooltipMain = "Beatmap listing";
             TooltipSub = "Browse for new beatmaps";
         }