From bd5493fb25f05c85cd5a4c3842be27c05551c715 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 16 Mar 2017 16:43:42 +0900 Subject: [PATCH] Add back correct defaults. --- osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs | 2 +- osu.Game/Screens/Select/FilterControl.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs b/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs index d09a2d5281..ba52a6ce6a 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs @@ -22,7 +22,7 @@ namespace osu.Desktop.VisualTests.Tests OsuTabControl filter; Add(filter = new OsuTabControl { - Width = 229, + Size = new Vector2(229, 24), AutoSort = true }); Add(text = new OsuSpriteText diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs index 167c12b69e..6cddd7b6d8 100644 --- a/osu.Game/Screens/Select/FilterControl.cs +++ b/osu.Game/Screens/Select/FilterControl.cs @@ -11,7 +11,6 @@ using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; using osu.Game.Graphics; using osu.Game.Graphics.UserInterface; -using osu.Game.Graphics.Sprites; using osu.Game.Screens.Select.Filter; using Container = osu.Framework.Graphics.Containers.Container; using osu.Framework.Graphics.UserInterface.Tab; @@ -97,7 +96,6 @@ namespace osu.Game.Screens.Select { RelativeSizeAxes = Axes.X, Height = 1, - Y = 24, Colour = OsuColour.Gray(80), Origin = Anchor.BottomLeft, Anchor = Anchor.BottomLeft, @@ -115,6 +113,7 @@ namespace osu.Game.Screens.Select groupTabs = new OsuTabControl { RelativeSizeAxes = Axes.X, + Height = 24, Width = 0.5f, AutoSort = true }, @@ -133,6 +132,7 @@ namespace osu.Game.Screens.Select { RelativeSizeAxes = Axes.X, Width = 0.5f, + Height = 24, AutoSort = true, } }