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

Merge branch 'master' into osu-fontusage

Browse Source
This commit is contained in:
Dean Herbert
2019-02-22 18:09:23 +09:00
committed by GitHub
parent 8853f7ad76 3f9a7b8873
commit 3015d40f8f
286 changed files with 837 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Edit/Components/BottomBarContainer.cs
View File

@ -3,7 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;

2
osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;

8
osu.Game/Screens/Edit/Components/PlaybackControl.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit.Components
}
};
tabs.Current.ValueChanged += newValue => Beatmap.Value.Track.Tempo.Value = newValue;
tabs.Current.ValueChanged += tempo => Beatmap.Value.Track.Tempo.Value = tempo.NewValue;
}
protected override bool OnKeyDown(KeyDownEvent e)
@ -162,9 +162,9 @@ namespace osu.Game.Screens.Edit.Components
private void updateState()
{
text.FadeColour(Active || IsHovered ? hoveredColour : normalColour, fade_duration, Easing.OutQuint);
text.FadeTo(Active ? 0 : 1, fade_duration, Easing.OutQuint);
textBold.FadeTo(Active ? 1 : 0, fade_duration, Easing.OutQuint);
text.FadeColour(Active.Value || IsHovered ? hoveredColour : normalColour, fade_duration, Easing.OutQuint);
text.FadeTo(Active.Value ? 0 : 1, fade_duration, Easing.OutQuint);
textBold.FadeTo(Active.Value ? 1 : 0, fade_duration, Easing.OutQuint);
}
}
}

12
osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
View File

@ -80,10 +80,10 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
{
base.LoadComplete();
button.Selected.ValueChanged += v =>
button.Selected.ValueChanged += selected =>
{
updateSelectionState();
if (v)
if (selected.NewValue)
Selected?.Invoke(button);
};
@ -95,16 +95,16 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
if (!IsLoaded)
return;
BackgroundColour = button.Selected ? selectedBackgroundColour : defaultBackgroundColour;
bubble.Colour = button.Selected ? selectedBubbleColour : defaultBubbleColour;
BackgroundColour = button.Selected.Value ? selectedBackgroundColour : defaultBackgroundColour;
bubble.Colour = button.Selected.Value ? selectedBubbleColour : defaultBubbleColour;
}
protected override bool OnClick(ClickEvent e)
{
if (button.Selected)
if (button.Selected.Value)
return true;
if (!Enabled)
if (!Enabled.Value)
return true;
button.Selected.Value = true;

2
osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
namespace osu.Game.Screens.Edit.Components.RadioButtons
{

4
osu.Game/Screens/Edit/Components/RadioButtons/RadioButtonCollection.cs
View File

@ -44,9 +44,9 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
private RadioButton currentlySelected;
private void addButton(RadioButton button)
{
button.Selected.ValueChanged += v =>
button.Selected.ValueChanged += selected =>
{
if (v)
if (selected.NewValue)
{
currentlySelected?.Deselect();
currentlySelected = button;

4
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
View File

@ -3,8 +3,8 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osuTK;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
@ -27,7 +27,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
Beatmap.ValueChanged += b =>
{
updateRelativeChildSize();
LoadBeatmap(b);
LoadBeatmap(b.NewValue);
};
}