Merge the BackgroundImageSource into Background #6819
Conversation
Enhances #3396 and fixes the issue where windows did not support initial backgrounds anymore
mattleibow
added
t/bug
| namespace Microsoft.Maui.Controls | ||
| { | ||
| [ContentProperty(nameof(ImageSource))] | ||
| class ImageBrush : Brush |
There was a problem hiding this comment.
This is internal for now, but after a few tests and some additional tweaks in other places, this will work for all things.
| public static void MapBackgroundImageSource(IViewHandler handler, IView view) | ||
| { | ||
| if (view is not IViewBackgroundImagePart viewBackgroundImagePart) | ||
| return; | ||
|
|
||
| if (handler.PlatformView is not PlatformView platformView) | ||
| return; | ||
|
|
||
| var provider = handler.GetRequiredService<IImageSourceServiceProvider>(); | ||
|
|
||
| platformView.UpdateBackgroundImageSourceAsync(viewBackgroundImagePart, provider) | ||
| .FireAndForget(handler); | ||
| } |
There was a problem hiding this comment.
Moved all these into the common file.
| if (view.Background is ImageSourcePaint image) | ||
| { | ||
| var provider = handler.GetRequiredService<IImageSourceServiceProvider>(); | ||
|
|
||
| platformView.UpdateBackgroundImageSourceAsync(image.ImageSource, provider) | ||
| .FireAndForget(handler); | ||
| } |
There was a problem hiding this comment.
This if block here is not so great, but still is good enough. Since this logic lives here and not in the extension method, none of the controls that re-define the background mapping - such as image, label, entry - get this enhanced background support.
To fully realize this new feature, we will need to move this logic into the UpdateBackground method and make it async and all that. Also, we probably need to consolidate the several UpdateBackground methods and variants scattered about.
|
|
||
| namespace Microsoft.Maui | ||
| { | ||
| class ImageSourcePaint : Paint |
There was a problem hiding this comment.
This can't really be moved into Maui.Graphics as it wraps a Maui UI type. This is fine here - either public or internal - as it is not actually used by Maui.Graphics at all.
There is the ImagePaint still, but that represents an image already loaded into memory. The pixel bits. This new type represents the potential image and something must load it.
| } | ||
|
|
||
| public static async Task UpdateBackgroundImageSourceAsync(this AView platformView, IViewBackgroundImagePart viewBackgroundImagePart, IImageSourceServiceProvider? provider) | ||
| public static async Task UpdateBackgroundImageSourceAsync(this AView platformView, IImageSource? imageSource, IImageSourceServiceProvider? provider) |
There was a problem hiding this comment.
This is technically a breaking change, but I don't think it is used in RC3 by anyone and will be quickly replaced by RC4/GA.
|
No type converters yet. I also kept everything internal. I tried making it public, but xamlc was not so happy. So, all internal for rc3 but we can add this in when there is more that 10 mins to launch. |
Eilon
removed
the
legacy-area-controls
5 participants
Description of Change
This PR moves the bits towards a single, unified
Backgroundproperty like all the other XAML flavours. Currently, the new types are internal until we can figure out the best way - maybe just make it public later and add XamlC?Issues Fixed
Fixes an issue where windows did not set the page background color as the background image would unset things.