-
Notifications
You must be signed in to change notification settings - Fork 2k
Fixed Label Span font property inheritance when applied via Style #34110
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.
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
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8ad1085
Fixed Label FontFamily should inherit to span for Android, iOS and wi…
SubhikshaSf4851 afe989c
Added Test sample and Snapshots for iOS and android
SubhikshaSf4851 711e650
updated fix and testcase.
Vignesh-SF3580 f81fffa
Moved code into common
SubhikshaSf4851 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+18.8 KB
...s/TestCases.Android.Tests/snapshots/android/SpanShouldInheritStyleFromLabel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 21326, "Span does not inherit text styling from Label if that styling is applied using Style", PlatformAffected.All)] | ||
| public partial class Issue21326 : ContentPage | ||
| { | ||
| public Issue21326() | ||
| { | ||
| var Issue21326resourceDictionary = new ResourceDictionary(); | ||
|
|
||
| var headingStyle = new Style(typeof(Label)); | ||
| headingStyle.Setters.Add(new Setter { Property = Label.FontFamilyProperty, Value = "MontserratBold" }); | ||
| headingStyle.Setters.Add(new Setter { Property = Label.FontSizeProperty, Value = 20.0 }); | ||
| Issue21326resourceDictionary.Add("HeadingStyle", headingStyle); | ||
|
|
||
| Resources = Issue21326resourceDictionary; | ||
|
|
||
| var Issue21326testLabel = new Label | ||
| { | ||
| Style = headingStyle, | ||
| AutomationId = "Issue21326Label" | ||
| }; | ||
|
|
||
| var formattedString = new FormattedString(); | ||
| formattedString.Spans.Add(new Span | ||
| { | ||
| Text = "SHOULD BE MONTSERRATBOLD from Style" | ||
| }); | ||
| Issue21326testLabel.FormattedText = formattedString; | ||
|
|
||
| Content = new VerticalStackLayout | ||
| { | ||
| Padding = 10, | ||
| Spacing = 20, | ||
| Children = | ||
| { | ||
| new Label { Text = "Test Passes if below label rendered in MontserratBold font from Style" }, | ||
| Issue21326testLabel | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
Vignesh-SF3580 marked this conversation as resolved.
|
||
20 changes: 20 additions & 0 deletions
20
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21326.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
|
||
| public class Issue21326 : _IssuesUITest | ||
| { | ||
| public override string Issue => "Span does not inherit text styling from Label if that styling is applied using Style"; | ||
|
|
||
| public Issue21326(TestDevice device) : base(device) { } | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.Label)] | ||
| public void SpanShouldInheritStyleFromLabel() | ||
| { | ||
| App.WaitForElement("Issue21326Label"); | ||
| VerifyScreenshot(); | ||
| } | ||
| } |
Binary file added
BIN
+24.5 KB
...ols/tests/TestCases.iOS.Tests/snapshots/ios/SpanShouldInheritStyleFromLabel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.