sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into optimised-has-flag-checks

Browse Source
This commit is contained in:
Dean Herbert
2021-02-25 21:24:39 +09:00
committed by GitHub
parent dcda7f62df 91e8abe901
commit 8004652d27
53 changed files with 140 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers;
@ -44,19 +45,19 @@ namespace osu.Game.Overlays.Toolbar
Texture = textures.Get(texture),
});
public string Text
public LocalisableString Text
{
get => DrawableText.Text;
set => DrawableText.Text = value;
}
public string TooltipMain
public LocalisableString TooltipMain
{
get => tooltip1.Text;
set => tooltip1.Text = value;
}
public string TooltipSub
public LocalisableString TooltipSub
{
get => tooltip2.Text;
set => tooltip2.Text = value;