Skip to content

Fix CircularProgress may have incorrect masking in some cases #6661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smoogipoo merged 2 commits into from
Oct 27, 2025
+10 −6
Merged

Fix CircularProgress may have incorrect masking in some cases #6661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3323cd9
Create failing masking condition
EVAST9919 Oct 26, 2025
4f93d06
Use local vertex position transform instead of matrix push
EVAST9919 Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions osu.Framework.Tests/Visual/UserInterface/TestSceneCircularProgress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,18 @@ private void load(TextureStore textures)
Origin = Anchor.Centre,
Size = new Vector2(250),
CornerRadius = 20,
Child = clock = new CircularProgress
Child = new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(400)
Masking = true,
Size = new Vector2(500),
Child = clock = new CircularProgress
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(400)
}
}
}
};
Expand Down
5 changes: 1 addition & 4 deletions osu.Framework/Graphics/UserInterface/CircularProgress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ private void drawTriangulatedShape(IRenderer renderer)
TexturedVertex2D first = v1;
TexturedVertex2D second = v2;

renderer.PushLocalMatrix(DrawInfo.Matrix);

for (int i = 0; i < segment_count * 2; i++)
{
TexturedVertex2D newVertex;
Expand All @@ -191,12 +189,11 @@ private void drawTriangulatedShape(IRenderer renderer)
isInnerVertex = !isInnerVertex;
}

renderer.PopLocalMatrix();
return;

TexturedVertex2D createVertex(Vector2 pos) => new TexturedVertex2D(renderer)
{
Position = pos * drawSize,
Position = Vector2Extensions.Transform(pos * drawSize, DrawInfo.Matrix),
Colour = DrawColourInfo.Colour.Interpolate(pos).SRGB,
TextureRect = new Vector4(tRect.Left, tRect.Top, tRect.Right, tRect.Bottom),
TexturePosition = new Vector2(tRect.Left + tRect.Width * pos.X, tRect.Top + tRect.Height * pos.Y)
Expand Down
Loading