-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[Windows] Fix unwanted corner radius in Shell flyout items #31937
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
Draft
Shalini-Ashokan
wants to merge
3
commits into
dotnet:main
Choose a base branch
from
Shalini-Ashokan:fix-17414
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+61
−0
Draft
Changes from all commits
Commits
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
Binary file added
BIN
+17.3 KB
...Android.Tests/snapshots/android/VerifyFlyoutContentHasNoDefaultCornerRadius.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,35 @@ | ||
namespace Maui.Controls.Sample.Issues; | ||
|
||
[Issue(IssueTracker.Github, 17414, "Default styling for controls does not work", PlatformAffected.UWP)] | ||
public partial class Issue17414Shell : Shell | ||
{ | ||
public Issue17414Shell() | ||
{ | ||
FlyoutBehavior = FlyoutBehavior.Flyout; | ||
ItemTemplate = new DataTemplate(() => | ||
{ | ||
return new Label | ||
{ | ||
Margin = new Thickness(20), | ||
Text = "Home" | ||
}; | ||
}); | ||
|
||
var detailContentPage = new ContentPage | ||
{ | ||
BackgroundColor = Colors.LightGreen, | ||
Content = new Label | ||
{ | ||
AutomationId = "MainPageLabel", | ||
Text = "Verify that the flyout content has no default corner radius", | ||
HorizontalOptions = LayoutOptions.Center, | ||
VerticalOptions = LayoutOptions.Center | ||
} | ||
}; | ||
|
||
Items.Add(new ShellContent | ||
{ | ||
Content = detailContentPage | ||
}); | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17414.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,24 @@ | ||
using NUnit.Framework; | ||
using UITest.Appium; | ||
using UITest.Core; | ||
|
||
namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
||
public class Issue17414 : _IssuesUITest | ||
{ | ||
public override string Issue => "Default styling for controls does not work"; | ||
|
||
public Issue17414(TestDevice device) | ||
: base(device) | ||
{ } | ||
|
||
[Test] | ||
[Category(UITestCategories.FlyoutPage)] | ||
[Category(UITestCategories.Shell)] | ||
public void VerifyFlyoutContentHasNoDefaultCornerRadius() | ||
{ | ||
App.WaitForElement("MainPageLabel"); | ||
App.TapShellFlyoutIcon(); | ||
VerifyScreenshot(); | ||
} | ||
} |
Binary file added
BIN
+19.6 KB
...stCases.iOS.Tests/snapshots/ios/VerifyFlyoutContentHasNoDefaultCornerRadius.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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be possible to apply the fix in the NavigationView Resources?
maui/src/Core/src/Platform/Windows/Styles/WindowRootViewStyle.xaml
Line 68 in d9ba884
In that way, developers that would like to keep the previous behavior or override it, can do easily just creating single resources and not require to override classes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jsuarezruiz, Thank you for the suggestion! After investigating WinUI's NavigationView template, I found that RootSplitView uses the
OverlayCornerRadius
resource key directly, and changing this global key would affect all overlay scenarios. Since there's no specific resource key for NavigationView's RootSplitView CornerRadius, the C# approach ensures we only target our specific NavigationView instance without impacting other UI elements.