[NUI] fixed bug about set desired size

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 5cd074a..00c7258 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -892,8 +892,11 @@ namespace Tizen.NUI.BaseComponents
             }
             set
             {
-                UpdateImage(ImageVisualProperty.DesiredWidth, new PropertyValue(value));
-                _desired_width = value;
+                if (_desired_width != value)
+                {
+                    _desired_width = value;
+                    UpdateImage(0, null);
+                }
             }
         }
 
@@ -917,8 +920,11 @@ namespace Tizen.NUI.BaseComponents
             }
             set
             {
-                UpdateImage(ImageVisualProperty.DesiredHeight, new PropertyValue(value));
-                _desired_height = value;
+                if (_desired_height != value)
+                {
+                    _desired_height = value;
+                    UpdateImage(0, null);
+                }
             }
         }
 
@@ -1142,21 +1148,22 @@ namespace Tizen.NUI.BaseComponents
                 {
                     Size2D imageSize = ImageLoading.GetOriginalImageSize(_resourceUrl);
 
-                    int ret_width, ret_height;
-                    if (imageSize.Width > imageSize.Height)
+                    int adjustedDesiredWidth, adjustedDesiredHeight;
+                    float aspectOfDesiredSize = (float)_desired_height / (float)_desired_width;
+                    float aspectOfImageSize = (float)imageSize.Height / (float)imageSize.Width;
+                    if( aspectOfImageSize > aspectOfDesiredSize)
                     {
-                        ret_width = _desired_width;
-                        ret_height = imageSize.Height * _desired_height / (imageSize.Width);
+                        adjustedDesiredWidth = _desired_width;
+                        adjustedDesiredHeight = imageSize.Height * _desired_width / imageSize.Width;
                     }
                     else
                     {
-                        ret_width = imageSize.Width * _desired_width / (imageSize.Height);
-                        ret_height = _desired_height;
-
+                        adjustedDesiredWidth = imageSize.Width * _desired_height/ imageSize.Height;
+                        adjustedDesiredHeight = _desired_height;
                     }
-                    temp.Insert(ImageVisualProperty.DesiredWidth, new PropertyValue((int)ret_width));
-                    temp.Insert(ImageVisualProperty.DesiredHeight, new PropertyValue((int)ret_height));
-                    temp.Insert(ImageVisualProperty.FittingMode, new PropertyValue((int)FittingModeType.ShrinkToFit));
+                    temp.Insert(ImageVisualProperty.DesiredWidth, new PropertyValue(adjustedDesiredWidth));
+                    temp.Insert(ImageVisualProperty.DesiredHeight, new PropertyValue(adjustedDesiredHeight));
+                    temp.Insert(ImageVisualProperty.FittingMode, new PropertyValue((int)FittingModeType.ScaleToFill));
                 }
             }