RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-06 11:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linter issues

Browse Source
This commit is contained in:
Drew DeVault 2017-03-15 22:39:09 -04:00
parent 0000cf1bee
commit 360340c61d
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using System.Linq;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics.UserInterface.Tab; using osu.Framework.Graphics.UserInterface.Tab;
@ -37,8 +38,10 @@ namespace osu.Game.Graphics.UserInterface
set set
{ {
accentColour = value; accentColour = value;
(DropDown as OsuTabDropDownMenu<T>).AccentColour = value; var dropDown = DropDown as OsuTabDropDownMenu<T>;
foreach (OsuTabItem<T> item in TabContainer.Children) if (dropDown != null)
dropDown.AccentColour = value;
foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
item.AccentColour = value; item.AccentColour = value;
} }
} }

1
osu.Game/Graphics/UserInterface/OsuTabDropDownHeader.cs
View File

@ -4,7 +4,6 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.UserInterface.Tab; using osu.Framework.Graphics.UserInterface.Tab;
using osu.Game.Graphics;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {

3
osu.Game/Graphics/UserInterface/OsuTabDropDownMenu.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Linq;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -25,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
accentColour = value; accentColour = value;
Header.Colour = value; Header.Colour = value;
foreach (OsuTabDropDownMenuItem<T> item in ItemList) foreach (var item in ItemList.OfType<OsuTabDropDownMenuItem<T>>())
item.AccentColour = value; item.AccentColour = value;
} }
} }

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

@ -31,7 +31,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4? accentColour; private Color4? accentColour;
public Color4 AccentColour public Color4 AccentColour
{ {
get { return accentColour.Value; } get { return accentColour.GetValueOrDefault(); }
set set
{ {
accentColour = value; accentColour = value;