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

Apply adjustments for framework changes

Browse Source
This commit is contained in:
smoogipoo
2019-10-23 14:04:06 +09:00
parent 75beba66d5
commit 851773a842
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -17,7 +17,7 @@ using osu.Framework.Input.Events;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
public class OsuSliderBar<T> : SliderBar<T>, IHasTooltip, IHasAccentColour public class OsuSliderBar<T> : SliderBar<T>, IHasTooltip, IHasAccentColour
where T : struct, IEquatable<T>, IComparable, IConvertible where T : struct, IEquatable<T>, IComparable<T>, IConvertible
{ {
/// <summary> /// <summary>
/// Maximum number of decimal digits to be displayed in the tooltip. /// Maximum number of decimal digits to be displayed in the tooltip.

4
osu.Game/Overlays/Settings/SettingsSlider.cs
View File

@ -8,12 +8,12 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Settings namespace osu.Game.Overlays.Settings
{ {
public class SettingsSlider<T> : SettingsSlider<T, OsuSliderBar<T>> public class SettingsSlider<T> : SettingsSlider<T, OsuSliderBar<T>>
where T : struct, IEquatable<T>, IComparable, IConvertible where T : struct, IEquatable<T>, IComparable<T>, IConvertible
{ {
} }
public class SettingsSlider<T, U> : SettingsItem<T> public class SettingsSlider<T, U> : SettingsItem<T>
where T : struct, IEquatable<T>, IComparable, IConvertible where T : struct, IEquatable<T>, IComparable<T>, IConvertible
where U : OsuSliderBar<T>, new() where U : OsuSliderBar<T>, new()
{ {
protected override Drawable CreateControl() => new U protected override Drawable CreateControl() => new U

2
osu.Game/Screens/Edit/BindableBeatDivisor.cs
View File

@ -10,7 +10,7 @@ using osuTK.Graphics;
namespace osu.Game.Screens.Edit namespace osu.Game.Screens.Edit
{ {
public class BindableBeatDivisor : BindableNumber<int> public class BindableBeatDivisor : BindableInt
{ {
public static readonly int[] VALID_DIVISORS = { 1, 2, 3, 4, 6, 8, 12, 16 }; public static readonly int[] VALID_DIVISORS = { 1, 2, 3, 4, 6, 8, 12, 16 };

2
osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Overlays.Settings;
namespace osu.Game.Screens.Play.PlayerSettings namespace osu.Game.Screens.Play.PlayerSettings
{ {
public class PlayerSliderBar<T> : SettingsSlider<T> public class PlayerSliderBar<T> : SettingsSlider<T>
where T : struct, IEquatable<T>, IComparable, IConvertible where T : struct, IEquatable<T>, IComparable<T>, IConvertible
{ {
public OsuSliderBar<T> Bar => (OsuSliderBar<T>)Control; public OsuSliderBar<T> Bar => (OsuSliderBar<T>)Control;