Cleanup (again)

This commit is contained in:
DrabWeb 2017-05-19 20:03:07 -03:00
parent c981a4a511
commit 83c81c0626
5 changed files with 6 additions and 13 deletions

View File

@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Direct
TextSize = 14, TextSize = 14,
Shadow = false, Shadow = false,
Colour = colours.Gray5, Colour = colours.Gray5,
Alpha = SetInfo.Metadata.Source == @"" ? 0 : 1, Alpha = string.IsNullOrEmpty(SetInfo.Metadata.Source) ? 0f : 1f,
}, },
}, },
}, },

View File

@ -136,7 +136,7 @@ namespace osu.Game.Overlays.Direct
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
TextSize = 14, TextSize = 14,
Alpha = SetInfo.Metadata.Source == @"" ? 0 : 1, Alpha = string.IsNullOrEmpty(SetInfo.Metadata.Source) ? 0f : 1f,
}, },
}, },
}, },
@ -190,7 +190,7 @@ namespace osu.Game.Overlays.Direct
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
icon.ScaleTo(1, 500, EasingTypes.OutElastic); icon.ScaleTo(1f, 500, EasingTypes.OutElastic);
} }
} }
} }

View File

@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Direct
Margin = new MarginPadding { Top = 8, Bottom = 8 }, Margin = new MarginPadding { Top = 8, Bottom = 8 },
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Text = (value as Enum)?.GetDescription() ?? value.ToString(), Text = (value as Enum).GetDescription() ?? value.ToString(),
TextSize = 14, TextSize = 14,
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
}, },

View File

@ -52,7 +52,7 @@ namespace osu.Game.Overlays
ThirdWaveColour = OsuColour.FromHex(@"005774"); ThirdWaveColour = OsuColour.FromHex(@"005774");
FourthWaveColour = OsuColour.FromHex(@"003a4e"); FourthWaveColour = OsuColour.FromHex(@"003a4e");
Header header = null; Header header;
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
@ -119,13 +119,7 @@ namespace osu.Game.Overlays
private void recreatePanels(PanelDisplayStyle displayStyle) private void recreatePanels(PanelDisplayStyle displayStyle)
{ {
var p = new List<DirectPanel>(); panels.Children = BeatmapSets.Select(b => displayStyle == PanelDisplayStyle.Grid ? (DirectPanel)new DirectGridPanel(b) { Width = 400 } : new DirectListPanel(b));
foreach (BeatmapSetInfo b in BeatmapSets)
p.Add(displayStyle == PanelDisplayStyle.Grid ? (DirectPanel)new DirectGridPanel(b) { Width = 400 } :
new DirectListPanel(b));
panels.Children = p;
} }
protected override void PopIn() protected override void PopIn()

View File

@ -460,7 +460,6 @@
<ItemGroup /> <ItemGroup />
<ItemGroup /> <ItemGroup />
<ItemGroup /> <ItemGroup />
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.