Skip to content
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

fix!: Remove focus-related properties from Control on WinUI-flavored builds #12268

Merged
merged 1 commit into from
May 13, 2023
Merged

fix!: Remove focus-related properties from Control on WinUI-flavored builds #12268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 41 additions & 1 deletion build/PackageDiffIgnore.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,22 @@
<Member fullName="Windows.UI.Xaml.DependencyProperty Windows.UI.Xaml.FrameworkElement::IsEnabledProperty()" reason="Api alignments" />
<Member fullName="System.Boolean Windows.UI.Xaml.FrameworkElement::IsEnabled()" reason="Api alignments" />


<Member fullName="Microsoft.UI.Xaml.FocusState Microsoft.UI.Xaml.Controls.Control::FocusState()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::FocusStateProperty()" reason="Api alignments" />
<Member fullName="System.Boolean Microsoft.UI.Xaml.Controls.Control::IsTabStop()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::IsTabStopProperty()" reason="Api alignments" />
<Member fullName="System.Int32 Microsoft.UI.Xaml.Controls.Control::TabIndex()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::TabIndexProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control::XYFocusUp()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::XYFocusUpProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control::XYFocusDown()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::XYFocusDownProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control::XYFocusLeft()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::XYFocusLeftProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control::XYFocusRight()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::XYFocusRightProperty()" reason="Api alignments" />
<Member fullName="System.Boolean Microsoft.UI.Xaml.Controls.Control::UseSystemFocusVisuals()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control::UseSystemFocusVisualsProperty()" reason="Api alignments" />
<Member fullName="System.String Windows.UI.Xaml.TemplatePartAttribute::Name()" reason="Api alignments" />
<Member fullName="System.Type Windows.UI.Xaml.TemplatePartAttribute::Type()" reason="Api alignments" />
<Member fullName="System.Double Windows.UI.Xaml.CornerRadius::TopLeft()" reason="Api alignments" />
Expand Down Expand Up @@ -1041,6 +1056,31 @@
<Member fullName="System.Void Windows.UI.Xaml.Controls.ListViewBaseScrollContentPresenter.SetContentOffset(CoreGraphics.CGPoint contentOffset, System.Boolean animated)" reason="Api alignments" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.ListViewBaseScrollContentPresenter.SetZoomScale(System.Runtime.InteropServices.NFloat scale, System.Boolean animated)" reason="Api alignments" />

<Member fullName="System.Boolean Microsoft.UI.Xaml.Controls.Control.Focus(Microsoft.UI.Xaml.FocusState value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.FocusState Microsoft.UI.Xaml.Controls.Control.get_FocusState()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_FocusState(Microsoft.UI.Xaml.FocusState value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_FocusStateProperty()" reason="Api alignments" />
<Member fullName="System.Boolean Microsoft.UI.Xaml.Controls.Control.get_IsTabStop()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_IsTabStop(System.Boolean value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_IsTabStopProperty()" reason="Api alignments" />
<Member fullName="System.Int32 Microsoft.UI.Xaml.Controls.Control.get_TabIndex()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_TabIndex(System.Int32 value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_TabIndexProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control.get_XYFocusUp()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_XYFocusUp(Microsoft.UI.Xaml.DependencyObject value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_XYFocusUpProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control.get_XYFocusDown()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_XYFocusDown(Microsoft.UI.Xaml.DependencyObject value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_XYFocusDownProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control.get_XYFocusLeft()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_XYFocusLeft(Microsoft.UI.Xaml.DependencyObject value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_XYFocusLeftProperty()" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyObject Microsoft.UI.Xaml.Controls.Control.get_XYFocusRight()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_XYFocusRight(Microsoft.UI.Xaml.DependencyObject value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_XYFocusRightProperty()" reason="Api alignments" />
<Member fullName="System.Boolean Microsoft.UI.Xaml.Controls.Control.get_UseSystemFocusVisuals()" reason="Api alignments" />
<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Control.set_UseSystemFocusVisuals(System.Boolean value)" reason="Api alignments" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.Control.get_UseSystemFocusVisualsProperty()" reason="Api alignments" />
<Member fullName="System.Void Windows.UI.Xaml.FrameworkElement.add_IsEnabledChanged(Windows.UI.Xaml.DependencyPropertyChangedEventHandler value)" reason="Api alignments" />
<Member fullName="System.Void Windows.UI.Xaml.FrameworkElement.remove_IsEnabledChanged(Windows.UI.Xaml.DependencyPropertyChangedEventHandler value)" reason="Api alignments" />
<Member fullName="Windows.UI.Xaml.DependencyProperty Windows.UI.Xaml.FrameworkElement.get_IsEnabledProperty()" reason="Api alignments" />
Expand Down
8 changes: 3 additions & 5 deletions src/Uno.UI/UI/Xaml/Controls/Control/Control.FocusMixins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// TODO Uno: As part of the next round of breaking changes,
// we can wrap the contents of this file in #if !HAS_UNO_WINUI,
// as the Control class does not declare these in WinUI.
// We still need to keep this on for UWP compilation however, so
// don't delete the file completely!
#if !HAS_UNO_WINUI

namespace Windows.UI.Xaml.Controls
{
public partial class Control
Expand Down Expand Up @@ -79,3 +76,4 @@ public partial class Control
public static new DependencyProperty UseSystemFocusVisualsProperty => UIElement.UseSystemFocusVisualsProperty;
}
}
#endif