From 360340c61d1038ccffc229e25c6a6449df092ea6 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 15 Mar 2017 22:39:09 -0400 Subject: [PATCH] Fix linter issues --- osu.Game/Graphics/UserInterface/OsuTabControl.cs | 7 +++++-- osu.Game/Graphics/UserInterface/OsuTabDropDownHeader.cs | 1 - osu.Game/Graphics/UserInterface/OsuTabDropDownMenu.cs | 3 ++- osu.Game/Graphics/UserInterface/OsuTabDropDownMenuItem.cs | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs index d03fb474b8..5f467b48ca 100644 --- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs +++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs @@ -2,6 +2,7 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; +using System.Linq; using OpenTK.Graphics; using osu.Framework.Allocation; using osu.Framework.Graphics.UserInterface.Tab; @@ -37,8 +38,10 @@ namespace osu.Game.Graphics.UserInterface set { accentColour = value; - (DropDown as OsuTabDropDownMenu).AccentColour = value; - foreach (OsuTabItem item in TabContainer.Children) + var dropDown = DropDown as OsuTabDropDownMenu; + if (dropDown != null) + dropDown.AccentColour = value; + foreach (var item in TabContainer.Children.OfType>()) item.AccentColour = value; } } diff --git a/osu.Game/Graphics/UserInterface/OsuTabDropDownHeader.cs b/osu.Game/Graphics/UserInterface/OsuTabDropDownHeader.cs index 5506365aef..2b4d68b4b4 100644 --- a/osu.Game/Graphics/UserInterface/OsuTabDropDownHeader.cs +++ b/osu.Game/Graphics/UserInterface/OsuTabDropDownHeader.cs @@ -4,7 +4,6 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.UserInterface.Tab; -using osu.Game.Graphics; namespace osu.Game.Graphics.UserInterface { diff --git a/osu.Game/Graphics/UserInterface/OsuTabDropDownMenu.cs b/osu.Game/Graphics/UserInterface/OsuTabDropDownMenu.cs index 51e7009e45..f84ab25354 100644 --- a/osu.Game/Graphics/UserInterface/OsuTabDropDownMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuTabDropDownMenu.cs @@ -1,6 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System.Linq; using OpenTK; using OpenTK.Graphics; using osu.Framework.Allocation; @@ -25,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface { accentColour = value; Header.Colour = value; - foreach (OsuTabDropDownMenuItem item in ItemList) + foreach (var item in ItemList.OfType>()) item.AccentColour = value; } } diff --git a/osu.Game/Graphics/UserInterface/OsuTabDropDownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuTabDropDownMenuItem.cs index 1df57e3ac6..86d451f7bb 100644 --- a/osu.Game/Graphics/UserInterface/OsuTabDropDownMenuItem.cs +++ b/osu.Game/Graphics/UserInterface/OsuTabDropDownMenuItem.cs @@ -31,7 +31,7 @@ namespace osu.Game.Graphics.UserInterface private Color4? accentColour; public Color4 AccentColour { - get { return accentColour.Value; } + get { return accentColour.GetValueOrDefault(); } set { accentColour = value;