Skip to content

[iOS, Mac] Fix for RadioButton TextColor for plain Content not working #31940

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

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

[iOS, Mac] Fix for RadioButton TextColor for plain Content not working #31940

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec4e66d
Fix for radiobutton content textcolor
HarishwaranVijayakumar Apr 1, 2025
3638015
Added TestCase
HarishwaranVijayakumar Apr 2, 2025
d0637a5
Modified the changes
HarishwaranVijayakumar Oct 8, 2025
270c88e
Add TestCase
HarishwaranVijayakumar Oct 9, 2025
8a9172d
Revert "Add TestCase"
HarishwaranVijayakumar Oct 9, 2025
bdf9816
Added comment
HarishwaranVijayakumar Oct 9, 2025
7dfbfd0
Modified the comment
HarishwaranVijayakumar Oct 9, 2025
4f6ed55
Added comments
HarishwaranVijayakumar Oct 10, 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
8 changes: 6 additions & 2 deletions src/Controls/src/Core/ContentConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ static View ConfigureView(View view, ContentPresenter presenter)
return view;
}

static Label ConvertToLabel(string textContent, ContentPresenter presenter)
static ContentLabel ConvertToLabel(string textContent, ContentPresenter presenter)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you include a related tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsuarezruiz, Tried to add test using Application.Current.Resources, but it breaks the other test cases.

{
var label = new Label
// Use ContentLabel instead of Label to avoid interference from global styles
var label = new ContentLabel
{
Text = textContent
};
Expand Down Expand Up @@ -129,4 +130,7 @@ static bool HasTemplateAncestor(ContentPresenter presenter, Type type)
return false;
}
}

// Internal label type used by ContentPresenter to avoid interference from global Label styles.
class ContentLabel : Label { }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can include a comment here?

Internal label type used by ContentPresenter to avoid interference from global Label styles.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsuarezruiz, I have added a comment.

}