summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangho Hur <kangho.hur@samsung.com>2017-01-19 07:25:28 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2017-01-19 07:25:28 (GMT)
commitaed94350a9ca9cf1949797f67486c0adf06adf6f (patch)
tree164386274cf53337bb82fbd8b5b8160da89d2341
parent957d69b288e37c3020a5bb00151566499f509614 (diff)
parentc5fd0e71156fa50a633e0b4a0c78ef0bd34332ab (diff)
downloadxamarin-forms-aed94350a9ca9cf1949797f67486c0adf06adf6f.zip
xamarin-forms-aed94350a9ca9cf1949797f67486c0adf06adf6f.tar.gz
xamarin-forms-aed94350a9ca9cf1949797f67486c0adf06adf6f.tar.bz2
Merge changes Iccc85ecb,I14ec9150 into tizen
* changes: Ensure that source is not null before accessing it Postpone property updates till image finishes loading
-rwxr-xr-xXamarin.Forms.Platform.Tizen/Native/Image.cs5
-rwxr-xr-xXamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs3
2 files changed, 3 insertions, 5 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Image.cs b/Xamarin.Forms.Platform.Tizen/Native/Image.cs
index 5b64c43..ceae4e5 100755
--- a/Xamarin.Forms.Platform.Tizen/Native/Image.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Image.cs
@@ -72,11 +72,10 @@ namespace Xamarin.Forms.Platform.Tizen.Native
/// <param name="source">Image source specifying from where the image data has to be loaded.</param>
public async Task<bool> LoadFromImageSourceAsync(ImageSource source)
{
- IImageSourceHandler handler = Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType());
-
_imageLoadCompleted = false;
+ IImageSourceHandler handler;
- if (source != null && handler != null)
+ if (source != null && (handler = Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null)
{
_imageLoadCompleted = await handler.LoadImageAsync(this, source);
}
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs
index 1f56edd..3617b70 100755
--- a/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs
@@ -61,6 +61,7 @@ namespace Xamarin.Forms.Platform.Tizen
if (!IsDisposed && success)
{
((IVisualElementController)Element).NativeSizeChanged();
+ UpdateIsOpaque();
UpdateBlendColor();
}
}
@@ -88,8 +89,6 @@ namespace Xamarin.Forms.Platform.Tizen
{
UpdateSource();
UpdateAspect();
- UpdateIsOpaque();
- UpdateBlendColor();
}
}