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

Merge branch 'master' into hide-desktop-only-elements

Browse Source
This commit is contained in:
Dean Herbert
2019-02-28 18:50:16 +09:00
committed by GitHub
parent 48fcaf34e6 bfe3d5708d
commit 5b53cf0961
317 changed files with 1093 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
public bool Bounding
{
get { return bounding; }
get => bounding;
set
{
bounding = value;
@ -277,6 +277,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
{
var h = Header as UserDropdownHeader;
if (h == null) return;
h.StatusColour = value;
}
}
@ -338,7 +339,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
public Color4 StatusColour
{
set { statusIcon.FadeColour(value, 500, Easing.OutQuint); }
set => statusIcon.FadeColour(value, 500, Easing.OutQuint);
}
public UserDropdownHeader()

4
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
AutoSizeDuration = transition_duration,
AutoSizeEasing = Easing.OutQuint,
Masking = true,
Children = new []
Children = new[]
{
new SettingsSlider<float>
{
@ -171,6 +171,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
}
private Drawable preview;
private void showPreview()
{
if (preview?.IsAlive != true)
@ -225,6 +226,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{
if (item == new Size(9999, 9999))
return "Default";
return $"{item.Width}x{item.Height}";
}
}

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

@ -14,8 +14,8 @@ namespace osu.Game.Overlays.Settings
public override string LabelText
{
get { return checkbox.LabelText; }
set { checkbox.LabelText = value; }
get => checkbox.LabelText;
set => checkbox.LabelText = value;
}
}
}

12
osu.Game/Overlays/Settings/SettingsItem.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings
public virtual string LabelText
{
get { return text?.Text ?? string.Empty; }
get => text?.Text ?? string.Empty;
set
{
if (text == null)
@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings
public virtual Bindable<T> Bindable
{
get { return bindable; }
get => bindable;
set
{
@ -76,11 +76,7 @@ namespace osu.Game.Overlays.Settings
public bool MatchingFilter
{
set
{
// probably needs a better transition.
this.FadeTo(value ? 1 : 0);
}
set => this.FadeTo(value ? 1 : 0);
}
protected SettingsItem()
@ -115,7 +111,7 @@ namespace osu.Game.Overlays.Settings
public Bindable<T> Bindable
{
get { return bindable; }
get => bindable;
set
{
bindable = value;

2
osu.Game/Overlays/Settings/SettingsSection.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Settings
public bool MatchingFilter
{
set { this.FadeTo(value ? 1 : 0); }
set => this.FadeTo(value ? 1 : 0);
}
protected SettingsSection()

6
osu.Game/Overlays/Settings/SettingsSubsection.cs
View File

@ -22,12 +22,10 @@ namespace osu.Game.Overlays.Settings
public IEnumerable<IFilterable> FilterableChildren => Children.OfType<IFilterable>();
public IEnumerable<string> FilterTerms => new[] { Header };
public bool MatchingFilter
{
set
{
this.FadeTo(value ? 1 : 0);
}
set => this.FadeTo(value ? 1 : 0);
}
protected SettingsSubsection()

2
osu.Game/Overlays/Settings/Sidebar.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Overlays.Settings
public ExpandedState State
{
get { return state; }
get => state;
set
{
expandEvent?.Cancel();

9
osu.Game/Overlays/Settings/SidebarButton.cs
View File

@ -26,12 +26,10 @@ namespace osu.Game.Overlays.Settings
public new Action<SettingsSection> Action;
private SettingsSection section;
public SettingsSection Section
{
get
{
return section;
}
get => section;
set
{
section = value;
@ -41,9 +39,10 @@ namespace osu.Game.Overlays.Settings
}
private bool selected;
public bool Selected
{
get { return selected; }
get => selected;
set
{
selected = value;