More tooltips!

mempler · Oct 29, 2021 · b33b294 · b33b294
1 parent 153c122
commit b33b294
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/Qsor.Game/Graphics/ClickableIcon.cs b/Qsor.Game/Graphics/ClickableIcon.cs
@@ -1,10 +1,14 @@
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 
 namespace Qsor.Game.Graphics
 {
-    public class ClickableIcon : SpriteIcon
+    public class ClickableIcon : SpriteIcon, IHasTooltip
     {
+        public LocalisableString TooltipText { get; set; }
+
         public delegate bool ClickDelegate(ClickEvent e);
         public ClickDelegate ClickEvent;
 

diff --git a/Qsor.Game/Graphics/Containers/QsorTooltipContainer.cs b/Qsor.Game/Graphics/Containers/QsorTooltipContainer.cs
@@ -43,7 +43,6 @@ private void Load()
                     new Box
                     {
                         Colour = Color4.Black,
-                        Alpha = .5f,
                         RelativeSizeAxes = Axes.Both,
                     },
                     _textFlowContainer = new TextFlowContainer

diff --git a/Qsor.Game/Graphics/DragProgressbar.cs b/Qsor.Game/Graphics/DragProgressbar.cs
@@ -1,12 +1,16 @@
 using System.Linq;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osuTK.Input;
 using Qsor.Game.Overlays.Drawables;
 
 namespace Qsor.Game.Graphics
 {
-    public class DragProgressbar : DrawableProgressbar
+    public class DragProgressbar : DrawableProgressbar, IHasTooltip
     {
+        public LocalisableString TooltipText { get; set; }
+
         public bool IsDragging { get; private set; }
         public bool JustClicked { get; set; } // TODO: use an action
 

diff --git a/Qsor.Game/Overlays/MusicPlayerOverlay.cs b/Qsor.Game/Overlays/MusicPlayerOverlay.cs
@@ -37,7 +37,7 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(6)
+                Spacing = new Vector2(6),
             };
 
             _Icons = new FillFlowContainer<ClickableIcon>
@@ -52,6 +52,8 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
                 Icon = FontAwesome.Solid.StepBackward,
                 Size = new Vector2(16),
 
+                TooltipText = "Previous track",
+
                 ClickEvent = e =>
                 {
                     notificationOverlay.AddBigNotification("<< Prev !Unimplemented!", 1100);
@@ -65,6 +67,8 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
                 Icon = FontAwesome.Solid.Play,
                 Size = new Vector2(16),
 
+                TooltipText = "Play",
+
                 ClickEvent = _ =>
                 {
                     notificationOverlay.AddBigNotification("Play", 1100);
@@ -91,6 +95,8 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
                 Icon = FontAwesome.Solid.Pause,
                 Size = new Vector2(16),
 
+                TooltipText = "Pause",
+
                 ClickEvent = e =>
                 {
                     beatmapManager?.WorkingBeatmap?.Value?.Track?.Start();
@@ -123,6 +129,8 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
                 Icon = FontAwesome.Solid.Stop,
                 Size = new Vector2(16),
 
+                TooltipText = "Stop the music!",
+
                 ClickEvent = e =>
                 {
                     notificationOverlay.AddBigNotification("Stop Playing", 1100);
@@ -139,6 +147,8 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
                 Icon = FontAwesome.Solid.StepForward,
                 Size = new Vector2(16),
 
+                TooltipText = "Next track",
+
                 ClickEvent = e =>
                 {
                     notificationOverlay.AddBigNotification(">> Next !Unimplemented!", 1100);
@@ -151,6 +161,8 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
                 Icon = FontAwesome.Solid.Info,
                 Size = new Vector2(16),
 
+                TooltipText = "View song info",
+
                 ClickEvent = e =>
                 {
                     notificationOverlay.AddBigNotification("Song info will be permanently displayed.", 1100);
@@ -163,6 +175,8 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
                 Icon = FontAwesome.Solid.Bars,
                 Size = new Vector2(16),
 
+                TooltipText = "Jump To window",
+
                 ClickEvent = e =>
                 {
                     notificationOverlay.AddBigNotification("!Unimplemented!", 1100);
@@ -174,7 +188,9 @@ private void Load(NotificationOverlay notificationOverlay, BeatmapManager beatma
 
             _flow.Add(Progressbar = new DragProgressbar
             {
-                Position = new Vector2(0, 24)
+                Position = new Vector2(0, 24),
+
+                TooltipText = "Drag to seek to a specific point in the song.",
             });
 
             Progressbar.Current.ValueChanged += e =>