From 7acff29bd377034481dfa637bcad93ae98d67757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 18 Jul 2017 11:53:56 +0300 Subject: [PATCH 1/2] Fix OsuTooltipContainer.PopIn not overriding PopOut transforms --- osu-framework | 2 +- osu.Game/Graphics/Cursor/OsuTooltipContainer.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 991177da4f..145cee6105 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 991177da4fbed2dd8260c215f2d341ebc858b03e +Subproject commit 145cee6105af742ddfd0c7ef147f72a3fcd8dc63 diff --git a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs index 7608a366dc..44d176f4d9 100644 --- a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs +++ b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs @@ -83,6 +83,8 @@ namespace osu.Game.Graphics.Cursor protected override void PopIn() { instantMovement |= !IsPresent; + + ClearTransforms(); FadeIn(500, EasingTypes.OutQuint); } From b2dd43075f0fd42b2af71ff5d4ae9fc534fb9e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 18 Jul 2017 11:57:41 +0300 Subject: [PATCH 2/2] Update framework --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 145cee6105..2a3b245da9 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 145cee6105af742ddfd0c7ef147f72a3fcd8dc63 +Subproject commit 2a3b245da9eff604be09d473203f829690d2808c