h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-06 20:04:32 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into more-inspections

Browse Source
This commit is contained in:
Dean Herbert
2019-02-28 14:32:57 +09:00
committed by GitHub
Unverified
parent 26d53d06a9 9fa8e6f3b9
commit 0788a7e9f1
130 changed files with 290 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+3 -4
View File
@@ -48,8 +48,7 @@ namespace osu.Game.Graphics.UserInterface
public override Anchor Origin
{
get { return base.Origin; }
get => base.Origin;
set
{
base.Origin = value;
@@ -152,12 +151,12 @@ namespace osu.Game.Graphics.UserInterface
public FontAwesome Icon
{
set { bouncingIcon.Icon = value; }
set => bouncingIcon.Icon = value;
}
public string Text
{
set { text.Text = value; }
set => text.Text = value;
}
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => IconLayer.ReceivePositionalInputAt(screenSpacePos) || TextLayer.ReceivePositionalInputAt(screenSpacePos);