h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 21:57:25 +08:00
Code Issues Releases Wiki Activity

Reapply "Add tooltip to rounded button"

Browse Source 
This reverts commit 1912b1fcf3.
This commit is contained in:
OliBomby 2024-10-01 15:28:13 +02:00
parent 1912b1fcf3
commit 4de73dd9c8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
View File

@ -155,6 +155,10 @@ namespace osu.Game.Rulesets.Osu.Edit
Action = () => GridFromPointsClicked?.Invoke(), Action = () => GridFromPointsClicked?.Invoke(),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Grid from points", Text = "Grid from points",
TooltipText = """
Left click to set the origin.
Click and drag to set the origin, rotation and spacing.
"""
}, },
gridTypeButtons = new EditorRadioButtonCollection gridTypeButtons = new EditorRadioButtonCollection
{ {

4
osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
@ -17,7 +18,7 @@ using osuTK.Graphics;
namespace osu.Game.Graphics.UserInterfaceV2 namespace osu.Game.Graphics.UserInterfaceV2
{ {
public partial class RoundedButton : OsuButton, IFilterable public partial class RoundedButton : OsuButton, IFilterable, IHasTooltip
{ {
protected TrianglesV2? Triangles { get; private set; } protected TrianglesV2? Triangles { get; private set; }
@ -107,5 +108,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
} }
public bool FilteringActive { get; set; } public bool FilteringActive { get; set; }
public LocalisableString TooltipText { get; set; }
} }
} }