summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Jin <feng16.jin@samsung.com>2017-10-16 18:45:46 +0800
committerFeng Jin <feng16.jin@samsung.com>2017-10-18 17:46:03 +0800
commit7add91d2684af9a7b1d004faafbb4c68ae6bcb1f (patch)
treee21b669e180a2c4b7b402ac5d5e72376bf5c083c
parent681eedd9a33287ec03020003ad38d0ec18e5fbd8 (diff)
downloadnui-7add91d2684af9a7b1d004faafbb4c68ae6bcb1f.tar.gz
nui-7add91d2684af9a7b1d004faafbb4c68ae6bcb1f.tar.bz2
nui-7add91d2684af9a7b1d004faafbb4c68ae6bcb1f.zip
Fix Left/Right/Up/DownFocusableView bug
=>If app set the Left/Right/Up/DownFocusableView to null, then it will be crash. Change-Id: I8795db240f4b30ce024566f61bf725c56b2483d6 Signed-off-by: Feng Jin <feng16.jin@samsung.com>
-rwxr-xr-xTizen.NUI/src/public/BaseComponents/View.cs37
1 files changed, 32 insertions, 5 deletions
diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs
index 3f23151..02603cc 100755
--- a/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -13,7 +13,6 @@
* limitations under the License.
*
*/
-
namespace Tizen.NUI.BaseComponents
{
@@ -1837,7 +1836,14 @@ namespace Tizen.NUI.BaseComponents
}
set
{
- LeftFocusableViewId = (int)value.GetId();
+ if(value)
+ {
+ LeftFocusableViewId = (int)value.GetId();
+ }
+ else
+ {
+ LeftFocusableViewId = -1;
+ }
}
}
@@ -1859,7 +1865,14 @@ namespace Tizen.NUI.BaseComponents
}
set
{
- RightFocusableViewId = (int)value.GetId();
+ if(value)
+ {
+ RightFocusableViewId = (int)value.GetId();
+ }
+ else
+ {
+ RightFocusableViewId = -1;
+ }
}
}
@@ -1881,7 +1894,14 @@ namespace Tizen.NUI.BaseComponents
}
set
{
- UpFocusableViewId = (int)value.GetId();
+ if(value)
+ {
+ UpFocusableViewId = (int)value.GetId();
+ }
+ else
+ {
+ UpFocusableViewId = -1;
+ }
}
}
@@ -1903,7 +1923,14 @@ namespace Tizen.NUI.BaseComponents
}
set
{
- DownFocusableViewId = (int)value.GetId();
+ if(value)
+ {
+ DownFocusableViewId = (int)value.GetId();
+ }
+ else
+ {
+ DownFocusableViewId = -1;
+ }
}
}