From ba38a27274fdeb70d05fc744eb3f3246cdeef9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 5 Feb 2017 15:17:54 +0100 Subject: [PATCH] Fix incorrect sizing of login button. When logging in or out the size of the login button would not correctly update, resulting in a messed-up flow of toolbar buttons. This branch fixes the problem by avoiding an invalidation-chain-breaking override of Size. Instead, the loginOverlay bypasses auto sizing by using a new framework feature. --- osu-framework | 2 +- osu.Game/Overlays/Toolbar/ToolbarUserArea.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index f9627494e4..16dd98adff 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit f9627494e444d8b35eb20d418539ada15f258c4d +Subproject commit 16dd98adffbfa8e555c5c5c3b04c755b51073ef2 diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs b/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs index 61a1af9537..8681bdf853 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs @@ -17,8 +17,6 @@ namespace osu.Game.Overlays.Toolbar public override bool Contains(Vector2 screenSpacePos) => true; - public override Vector2 Size => button.Size; - public ToolbarUserArea() { RelativeSizeAxes = Axes.Y; @@ -31,6 +29,7 @@ namespace osu.Game.Overlays.Toolbar }, loginOverlay = new LoginOverlay { + BypassAutoSizeAxes = Axes.Both, Position = new Vector2(0, 1), RelativePositionAxes = Axes.Y, Anchor = Anchor.TopRight,