diff --git a/osu.Game.Tests/Visual/TestCaseLineBadge.cs b/osu.Game.Tests/Visual/TestCaseLineBadge.cs
index 304b0f9518..d80ef0131b 100644
--- a/osu.Game.Tests/Visual/TestCaseLineBadge.cs
+++ b/osu.Game.Tests/Visual/TestCaseLineBadge.cs
@@ -13,10 +13,10 @@ namespace osu.Game.Tests.Visual
{
public TestCaseLineBadge()
{
- Container containerHorizontal;
+ Container container;
LineBadge lineBadge;
- Add(containerHorizontal = new Container
+ Add(container = new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual
AddStep(@"", () => { });
AddStep(@"Collapse", () => lineBadge.Collapse());
AddStep(@"Uncollapse", () => lineBadge.Uncollapse());
- AddSliderStep(@"Resize container", 1, 300, 150, value => containerHorizontal.ResizeTo(value));
+ AddSliderStep(@"Resize container", 1, 300, 150, value => container.ResizeTo(value));
AddStep(@"Horizontal", () => lineBadge.IsHorizontal = true);
AddStep(@"Anchor top", () => lineBadge.Anchor = Anchor.TopCentre);
AddStep(@"Vertical", () => lineBadge.IsHorizontal = false);
diff --git a/osu.Game/Graphics/UserInterface/LineBadge.cs b/osu.Game/Graphics/UserInterface/LineBadge.cs
index 91dd2add1f..0283559aee 100644
--- a/osu.Game/Graphics/UserInterface/LineBadge.cs
+++ b/osu.Game/Graphics/UserInterface/LineBadge.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
/// takes up the full parent's axis defined by .
///
/// Whether to initialize with the
- /// or the
+ /// or the .
public LineBadge(bool startCollapsed = true)
{
IsCollapsed = startCollapsed;
diff --git a/osu.Game/Graphics/UserInterface/TooltipIconButton.cs b/osu.Game/Graphics/UserInterface/TooltipIconButton.cs
index 7f6641817a..1dfec5cb80 100644
--- a/osu.Game/Graphics/UserInterface/TooltipIconButton.cs
+++ b/osu.Game/Graphics/UserInterface/TooltipIconButton.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Graphics.UserInterface
{
private readonly SpriteIcon icon;
private SampleChannel sampleHover;
+
public Action Action;
private bool isEnabled;
@@ -30,7 +31,7 @@ namespace osu.Game.Graphics.UserInterface
set
{
isEnabled = value;
- icon.Alpha = value ? 1 : 0.5f;
+ icon.FadeTo(value ? 1 : 0.5f, 250);
}
}
diff --git a/osu.Game/Overlays/Changelog/ChangelogChart.cs b/osu.Game/Overlays/Changelog/ChangelogChart.cs
index 91e2aa5e49..667f206250 100644
--- a/osu.Game/Overlays/Changelog/ChangelogChart.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogChart.cs
@@ -15,7 +15,6 @@ using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Overlays.Changelog
{
// maybe look to osu.Game.Screens.Play.SquareGraph for reference later
- // placeholder json file: https://api.myjson.com/bins/10ye8a
public class ChangelogChart : BufferedContainer
{
private readonly Box background;
@@ -43,10 +42,6 @@ namespace osu.Game.Overlays.Changelog
};
}
- ///
- /// Draw the graph for a specific build
- ///
-
private bool isEmpty(APIChangelogChart changelogChart)
{
if (changelogChart != null)
diff --git a/osu.Game/Overlays/Changelog/ChangelogContent.cs b/osu.Game/Overlays/Changelog/ChangelogContent.cs
index f6e90b83a3..9d81fcb30f 100644
--- a/osu.Game/Overlays/Changelog/ChangelogContent.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogContent.cs
@@ -31,7 +31,6 @@ namespace osu.Game.Overlays.Changelog
public void ShowListing(APIChangelog[] changelog)
{
DateTime currentDate = new DateTime();
-
Clear();
foreach (APIChangelog build in changelog)
@@ -48,10 +47,10 @@ namespace osu.Game.Overlays.Changelog
Margin = new MarginPadding { Top = 30, },
});
}
- // watch out for this?
- Add(changelogContentGroup = new ChangelogContentGroup(build, true));
+ changelogContentGroup = new ChangelogContentGroup(build, true);
changelogContentGroup.BuildSelected += OnBuildSelected;
changelogContentGroup.GenerateText(build.ChangelogEntries);
+ Add(changelogContentGroup);
currentDate = build.CreatedAt.Date;
}
else
@@ -63,9 +62,11 @@ namespace osu.Game.Overlays.Changelog
Colour = new Color4(32, 24, 35, 255),
Margin = new MarginPadding { Top = 30, },
});
- Add(changelogContentGroup = new ChangelogContentGroup(build, false));
+
+ changelogContentGroup = new ChangelogContentGroup(build, false);
changelogContentGroup.BuildSelected += OnBuildSelected;
changelogContentGroup.GenerateText(build.ChangelogEntries);
+ Add(changelogContentGroup);
}
}
}