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

Merge branch 'master' into realm-migration-operation-blocking

Browse Source
This commit is contained in:
Dean Herbert
2021-03-19 21:33:26 +09:00
parent d69a4914e0 413754ede3
commit 03592fa696
583 changed files with 11847 additions and 4319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
@ -13,6 +14,7 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Database;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers;
@ -43,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;
@ -77,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar
private RealmContextFactory realmFactory { get; set; }
protected ToolbarButton()
: base(HoverSampleSet.Loud)
: base(HoverSampleSet.Toolbar)
{
Width = Toolbar.HEIGHT;
RelativeSizeAxes = Axes.Y;
@ -127,9 +129,9 @@ namespace osu.Game.Overlays.Toolbar
{
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.Both, // stops us being considered in parent's autosize
Anchor = TooltipAnchor.HasFlag(Anchor.x0) ? Anchor.BottomLeft : Anchor.BottomRight,
Anchor = TooltipAnchor.HasFlagFast(Anchor.x0) ? Anchor.BottomLeft : Anchor.BottomRight,
Origin = TooltipAnchor,
Position = new Vector2(TooltipAnchor.HasFlag(Anchor.x0) ? 5 : -5, 5),
Position = new Vector2(TooltipAnchor.HasFlagFast(Anchor.x0) ? 5 : -5, 5),
Alpha = 0,
Children = new Drawable[]
{