-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
[Windows] Fix Picker alignment issues #13516
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
5bc6d1b
Fix Windows Picker alignment issues
jsuarezruiz 519111f
Refactoring code
jsuarezruiz f1cdf16
Update src/Controls/samples/Controls.Sample/Pages/Controls/PickerPage…
jsuarezruiz 8db5a55
Auto-format source code
23026bd
Fix build errors
jsuarezruiz 672a644
Auto-format source code
01b18bf
Merge branch 'main' into fix-6391
jsuarezruiz 181cd23
Merge branch 'main' into fix-6391
jsuarezruiz 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 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 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 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 |
---|---|---|
@@ -1,7 +1,18 @@ | ||
namespace Microsoft.Maui.Controls | ||
using System; | ||
using Microsoft.Maui.Controls.Platform; | ||
|
||
namespace Microsoft.Maui.Controls | ||
{ | ||
public partial class Picker | ||
{ | ||
public static void MapHorizontalOptions(IPickerHandler handler, Picker picker) | ||
{ | ||
handler.PlatformView?.UpdateHorizontalOptions(picker); | ||
} | ||
|
||
public static void MapVerticalOptions(IPickerHandler handler, Picker picker) | ||
{ | ||
handler.PlatformView?.UpdateVerticalOptions(picker); | ||
} | ||
} | ||
} |
This file contains 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
32 changes: 32 additions & 0 deletions
32
src/Controls/src/Core/Platform/Windows/Extensions/PickerExtensions.cs
This file contains 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,32 @@ | ||
using System; | ||
using Microsoft.UI.Xaml; | ||
|
||
namespace Microsoft.Maui.Controls.Platform | ||
{ | ||
public static class PickerExtensions | ||
{ | ||
public static void UpdateHorizontalOptions(this FrameworkElement platformView, View view) | ||
{ | ||
platformView.HorizontalAlignment = view.HorizontalOptions.Alignment switch | ||
{ | ||
LayoutAlignment.Start => HorizontalAlignment.Left, | ||
LayoutAlignment.Center => HorizontalAlignment.Center, | ||
LayoutAlignment.End => HorizontalAlignment.Right, | ||
LayoutAlignment.Fill => HorizontalAlignment.Stretch, | ||
_ => throw new ArgumentOutOfRangeException() | ||
}; | ||
} | ||
|
||
public static void UpdateVerticalOptions(this FrameworkElement platformView, View view) | ||
{ | ||
platformView.VerticalAlignment = view.VerticalOptions.Alignment switch | ||
{ | ||
LayoutAlignment.Start => VerticalAlignment.Top, | ||
LayoutAlignment.Center => VerticalAlignment.Center, | ||
LayoutAlignment.End => VerticalAlignment.Bottom, | ||
LayoutAlignment.Fill => VerticalAlignment.Stretch, | ||
_ => throw new ArgumentOutOfRangeException() | ||
}; | ||
} | ||
} | ||
} |
This file contains 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 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.
It is a Draft because I am reviewing why this is necessary in the case of the Picker in Windows.