sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into update-scrollcontainer

Browse Source
This commit is contained in:
Dean Herbert
2019-06-14 23:25:17 +09:00
parent bc574520bf 51ff0d71d1
commit 1b75fbed9a
9 changed files with 143 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
View File

@ -171,7 +171,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
// Small offset to look a bit better centered along with the divisor text
Y = 1;
ButtonSize = new Vector2(20);
Size = new Vector2(20);
IconScale = new Vector2(0.6f);
}

4
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
View File

@ -31,14 +31,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
InternalChild = button = new TimelineIconButton { Action = () => Action?.Invoke() };
button.Enabled.BindTo(Enabled);
Width = button.ButtonSize.X;
Width = button.Width;
}
protected override void Update()
{
base.Update();
button.ButtonSize = new Vector2(button.ButtonSize.X, DrawHeight);
button.Size = new Vector2(button.Width, DrawHeight);
}
private class TimelineIconButton : IconButton