diff --git a/src/Controls/src/Core/ImageBrush.cs b/src/Controls/src/Core/ImageBrush.cs index cbb8bf001a12..3a991a0005a8 100644 --- a/src/Controls/src/Core/ImageBrush.cs +++ b/src/Controls/src/Core/ImageBrush.cs @@ -1,7 +1,7 @@ namespace Microsoft.Maui.Controls { [ContentProperty(nameof(ImageSource))] - class ImageBrush : Brush + public class ImageBrush : Brush { public ImageBrush() { diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt index 3f6e397ed696..a5c18c88a717 100644 --- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt @@ -26,6 +26,15 @@ Microsoft.Maui.Controls.Handlers.ShellSectionWrapperFragment.ShellSectionWrapper Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker! Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void +Microsoft.Maui.Controls.ImageBrush +Microsoft.Maui.Controls.ImageBrush.ImageBrush() -> void +Microsoft.Maui.Controls.ImageBrush.ImageBrush(Microsoft.Maui.Controls.ImageSource! imageSource) -> void +override Microsoft.Maui.Controls.ImageBrush.Equals(object? obj) -> bool +override Microsoft.Maui.Controls.ImageBrush.GetHashCode() -> int +override Microsoft.Maui.Controls.ImageBrush.IsEmpty.get -> bool +static readonly Microsoft.Maui.Controls.ImageBrush.ImageSourceProperty -> Microsoft.Maui.Controls.BindableProperty! +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.get -> Microsoft.Maui.Controls.ImageSource? +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.set -> void Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void Microsoft.Maui.Controls.Label.~Label() -> void Microsoft.Maui.Controls.LongPressGestureRecognizer diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt index 120c438f8a55..6623b6e320ac 100644 --- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt @@ -1,4 +1,13 @@ #nullable enable +Microsoft.Maui.Controls.ImageBrush +Microsoft.Maui.Controls.ImageBrush.ImageBrush() -> void +Microsoft.Maui.Controls.ImageBrush.ImageBrush(Microsoft.Maui.Controls.ImageSource! imageSource) -> void +override Microsoft.Maui.Controls.ImageBrush.Equals(object? obj) -> bool +override Microsoft.Maui.Controls.ImageBrush.GetHashCode() -> int +override Microsoft.Maui.Controls.ImageBrush.IsEmpty.get -> bool +static readonly Microsoft.Maui.Controls.ImageBrush.ImageSourceProperty -> Microsoft.Maui.Controls.BindableProperty! +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.get -> Microsoft.Maui.Controls.ImageSource? +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.set -> void *REMOVED*~override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRootRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList Microsoft.Maui.Controls.AppThemeBinding diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt index af164c3542ba..b18196f2244a 100644 --- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt @@ -1,4 +1,13 @@ #nullable enable +Microsoft.Maui.Controls.ImageBrush +Microsoft.Maui.Controls.ImageBrush.ImageBrush() -> void +Microsoft.Maui.Controls.ImageBrush.ImageBrush(Microsoft.Maui.Controls.ImageSource! imageSource) -> void +override Microsoft.Maui.Controls.ImageBrush.Equals(object? obj) -> bool +override Microsoft.Maui.Controls.ImageBrush.GetHashCode() -> int +override Microsoft.Maui.Controls.ImageBrush.IsEmpty.get -> bool +static readonly Microsoft.Maui.Controls.ImageBrush.ImageSourceProperty -> Microsoft.Maui.Controls.BindableProperty! +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.get -> Microsoft.Maui.Controls.ImageSource? +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.set -> void *REMOVED*~override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRootRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList Microsoft.Maui.Controls.AppThemeBinding diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt index 6ab89ba0fff4..c9adeccf3782 100644 --- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt @@ -2,6 +2,15 @@ Microsoft.Maui.Controls.Window.StatusBarTheme.get -> Microsoft.Maui.StatusBarTheme Microsoft.Maui.Controls.Window.StatusBarTheme.set -> void static readonly Microsoft.Maui.Controls.Window.StatusBarThemeProperty -> Microsoft.Maui.Controls.BindableProperty! +Microsoft.Maui.Controls.ImageBrush +Microsoft.Maui.Controls.ImageBrush.ImageBrush() -> void +Microsoft.Maui.Controls.ImageBrush.ImageBrush(Microsoft.Maui.Controls.ImageSource! imageSource) -> void +override Microsoft.Maui.Controls.ImageBrush.Equals(object? obj) -> bool +override Microsoft.Maui.Controls.ImageBrush.GetHashCode() -> int +override Microsoft.Maui.Controls.ImageBrush.IsEmpty.get -> bool +static readonly Microsoft.Maui.Controls.ImageBrush.ImageSourceProperty -> Microsoft.Maui.Controls.BindableProperty! +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.get -> Microsoft.Maui.Controls.ImageSource? +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.set -> void Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker! Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt index 6ddee0a9ddde..f95a91e37549 100644 --- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt @@ -15,6 +15,15 @@ Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target, Sy Microsoft.Maui.Controls.AppThemeBinding Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void Microsoft.Maui.Controls.BoxView.~BoxView() -> void +Microsoft.Maui.Controls.ImageBrush +Microsoft.Maui.Controls.ImageBrush.ImageBrush() -> void +Microsoft.Maui.Controls.ImageBrush.ImageBrush(Microsoft.Maui.Controls.ImageSource! imageSource) -> void +override Microsoft.Maui.Controls.ImageBrush.Equals(object? obj) -> bool +override Microsoft.Maui.Controls.ImageBrush.GetHashCode() -> int +override Microsoft.Maui.Controls.ImageBrush.IsEmpty.get -> bool +static readonly Microsoft.Maui.Controls.ImageBrush.ImageSourceProperty -> Microsoft.Maui.Controls.BindableProperty! +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.get -> Microsoft.Maui.Controls.ImageSource? +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.set -> void Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void Microsoft.Maui.Controls.LongPressGestureRecognizer Microsoft.Maui.Controls.LongPressGestureRecognizer.AllowableMovement.get -> double diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt index ff27dbb7a2b4..b440a5d56726 100644 --- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt @@ -37,6 +37,15 @@ Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.ResourcesChangedEventArgs(System.Collections.Generic.IEnumerable keys, System.Func resolver) -> void ~Microsoft.Maui.Controls.Internals.TypedBindingBase.ConverterCulture.get -> System.Globalization.CultureInfo ~Microsoft.Maui.Controls.Internals.TypedBindingBase.ConverterCulture.set -> void +Microsoft.Maui.Controls.ImageBrush +Microsoft.Maui.Controls.ImageBrush.ImageBrush() -> void +Microsoft.Maui.Controls.ImageBrush.ImageBrush(Microsoft.Maui.Controls.ImageSource! imageSource) -> void +override Microsoft.Maui.Controls.ImageBrush.Equals(object? obj) -> bool +override Microsoft.Maui.Controls.ImageBrush.GetHashCode() -> int +override Microsoft.Maui.Controls.ImageBrush.IsEmpty.get -> bool +static readonly Microsoft.Maui.Controls.ImageBrush.ImageSourceProperty -> Microsoft.Maui.Controls.BindableProperty! +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.get -> Microsoft.Maui.Controls.ImageSource? +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.set -> void Microsoft.Maui.Controls.LongPressGestureRecognizer Microsoft.Maui.Controls.LongPressGestureRecognizer.AllowableMovement.get -> double Microsoft.Maui.Controls.LongPressGestureRecognizer.AllowableMovement.set -> void diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt index 067390072045..13b62d3e15cc 100644 --- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt @@ -28,6 +28,15 @@ Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.ResourcesChangedEventArgs(System.Collections.Generic.IEnumerable keys, System.Func resolver) -> void ~Microsoft.Maui.Controls.Internals.TypedBindingBase.ConverterCulture.get -> System.Globalization.CultureInfo ~Microsoft.Maui.Controls.Internals.TypedBindingBase.ConverterCulture.set -> void +Microsoft.Maui.Controls.ImageBrush +Microsoft.Maui.Controls.ImageBrush.ImageBrush() -> void +Microsoft.Maui.Controls.ImageBrush.ImageBrush(Microsoft.Maui.Controls.ImageSource! imageSource) -> void +override Microsoft.Maui.Controls.ImageBrush.Equals(object? obj) -> bool +override Microsoft.Maui.Controls.ImageBrush.GetHashCode() -> int +override Microsoft.Maui.Controls.ImageBrush.IsEmpty.get -> bool +static readonly Microsoft.Maui.Controls.ImageBrush.ImageSourceProperty -> Microsoft.Maui.Controls.BindableProperty! +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.get -> Microsoft.Maui.Controls.ImageSource? +virtual Microsoft.Maui.Controls.ImageBrush.ImageSource.set -> void Microsoft.Maui.Controls.LongPressGestureRecognizer Microsoft.Maui.Controls.LongPressGestureRecognizer.AllowableMovement.get -> double Microsoft.Maui.Controls.LongPressGestureRecognizer.AllowableMovement.set -> void diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnAbsoluteLayoutAndScrollView.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnAbsoluteLayoutAndScrollView.png new file mode 100644 index 000000000000..61f32d36cbfd Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnAbsoluteLayoutAndScrollView.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCarouselViewAndStackLayout.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCarouselViewAndStackLayout.png new file mode 100644 index 000000000000..f8385edcb6af Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCarouselViewAndStackLayout.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCheckBoxAndRadioButton.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCheckBoxAndRadioButton.png new file mode 100644 index 000000000000..05084feca1ea Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCheckBoxAndRadioButton.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCollectionViewAndSwipeView.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCollectionViewAndSwipeView.png new file mode 100644 index 000000000000..2529347e95b6 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnCollectionViewAndSwipeView.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnContentViewAndBorder.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnContentViewAndBorder.png new file mode 100644 index 000000000000..97d7ecbcfc84 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnContentViewAndBorder.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnDatePickerAndTimePicker.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnDatePickerAndTimePicker.png new file mode 100644 index 000000000000..3466735839ac Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnDatePickerAndTimePicker.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnEntryAndEditor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnEntryAndEditor.png new file mode 100644 index 000000000000..38f79e61bf74 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnEntryAndEditor.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnGridAndFlexLayout.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnGridAndFlexLayout.png new file mode 100644 index 000000000000..3cc2a1f7cbdc Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnGridAndFlexLayout.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnImageAndImageButton.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnImageAndImageButton.png new file mode 100644 index 000000000000..f095a928fde2 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnImageAndImageButton.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnLabelAndButton.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnLabelAndButton.png new file mode 100644 index 000000000000..06747f98fa05 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnLabelAndButton.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSearchBarAndPicker.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSearchBarAndPicker.png new file mode 100644 index 000000000000..d581758d77de Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSearchBarAndPicker.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSliderAndProgressBar.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSliderAndProgressBar.png new file mode 100644 index 000000000000..d99c64d6144b Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSliderAndProgressBar.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSwitchAndStepper.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSwitchAndStepper.png new file mode 100644 index 000000000000..e539da53c216 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageBrushOnSwitchAndStepper.png differ diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue12928.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue12928.xaml new file mode 100644 index 000000000000..c5bae8c6ecf2 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue12928.xaml @@ -0,0 +1,43 @@ + + + + + +