From b5a8ef07fe4da5ba5b33b2ac40c00086edcff409 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 22:39:57 +0900 Subject: [PATCH] Update framework. --- osu-framework | 2 +- osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/osu-framework b/osu-framework index 4834d27107..8c79c94aa7 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 4834d27107198b9dc2f0e073be484cf0b92e0416 +Subproject commit 8c79c94aa71711cf9c8bb169f684df2e35596f9d diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs index b9ebcff65a..786636ce1a 100644 --- a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs @@ -1,8 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Collections.Generic; -using System.Linq; using osu.Framework.Graphics.Transforms; using osu.Framework.Graphics.UserInterface; using OpenTK; @@ -15,9 +13,6 @@ public class OsuDropDownMenu : DropDownMenu { protected override DropDownHeader CreateHeader() => new OsuDropDownHeader(); - protected override IEnumerable> GetDropDownItems(IEnumerable> values) - => values.Select(v => new OsuDropDownMenuItem(v.Key, v.Value)); - public OsuDropDownMenu() { ContentContainer.CornerRadius = 4; @@ -38,5 +33,7 @@ protected override void UpdateContentHeight() { ContentContainer.ResizeTo(State == DropDownMenuState.Opened ? new Vector2(1, ContentHeight) : new Vector2(1, 0), 300, EasingTypes.OutQuint); } + + protected override DropDownMenuItem CreateDropDownItem(string key, U value) => new OsuDropDownMenuItem(key, value); } } \ No newline at end of file