From 52dd5ddba66c50ba33b25c7005314bac12436e76 Mon Sep 17 00:00:00 2001 From: Aergwyn Date: Fri, 29 Dec 2017 20:03:43 +0100 Subject: [PATCH 1/2] fix repeat points not scaling properly --- .../Objects/Drawables/DrawableRepeatPoint.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs index a9b63ea642..dc64294eea 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs @@ -27,8 +27,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables AutoSizeAxes = Axes.Both; Blending = BlendingMode.Additive; Origin = Anchor.Centre; - Scale = new Vector2(0.5f); - Children = new Drawable[] { new SpriteIcon @@ -36,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables Icon = FontAwesome.fa_eercast, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(32), + Size = new Vector2(32 * repeatPoint.Scale), } }; } From 1f71bd3425910870b843c36a1dbbcffe5657dc8c Mon Sep 17 00:00:00 2001 From: Aergwyn Date: Sat, 30 Dec 2017 09:05:40 +0100 Subject: [PATCH 2/2] scale the correct part of the repeat point --- .../Objects/Drawables/DrawableRepeatPoint.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs index dc64294eea..4f3f951948 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs @@ -24,17 +24,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables this.repeatPoint = repeatPoint; this.drawableSlider = drawableSlider; - AutoSizeAxes = Axes.Both; + Size = new Vector2(32 * repeatPoint.Scale); + Blending = BlendingMode.Additive; Origin = Anchor.Centre; + Children = new Drawable[] { new SpriteIcon { - Icon = FontAwesome.fa_eercast, - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Size = new Vector2(32 * repeatPoint.Scale), + RelativeSizeAxes = Axes.Both, + Icon = FontAwesome.fa_eercast } }; }