From 786c5757010ba51372c1873f7eb2c0e065565f96 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Wed, 5 Apr 2017 13:33:10 +0900 Subject: [PATCH] fix PreFocusChange signal count error Signed-off-by: dongsug.song Change-Id: If7b91770fb15c611cdde273b8b068b727a89b0d7 --- .../NUISamples.TizenTV/examples/dali-test.cs | 44 ++++++++++++++++++++++ .../NUISamples.TizenTV/examples/flex-container.cs | 8 ++++ src/Tizen.NUI/Tizen.NUI.csproj | 2 +- .../src/internal/CustomAlgorithmInterface.cs | 2 +- src/Tizen.NUI/src/internal/PropertyRangeManager.cs | 8 ++-- src/Tizen.NUI/src/internal/ViewImpl.cs | 2 +- src/Tizen.NUI/src/internal/ViewRegistry.cs | 8 ++-- src/Tizen.NUI/src/public/Animation.cs | 18 ++++++++- src/Tizen.NUI/src/public/Button.cs | 8 ++-- src/Tizen.NUI/src/public/FocusManager.cs | 27 ++++++++++--- src/Tizen.NUI/src/public/Popup.cs | 10 ++--- src/Tizen.NUI/src/public/ProgressBar.cs | 2 +- src/Tizen.NUI/src/public/ScrollBar.cs | 4 +- src/Tizen.NUI/src/public/Slider.cs | 6 +-- src/Tizen.NUI/src/public/Stage.cs | 14 +++---- src/Tizen.NUI/src/public/StyleManager.cs | 2 +- src/Tizen.NUI/src/public/TextEditor.cs | 2 +- src/Tizen.NUI/src/public/TextField.cs | 4 +- src/Tizen.NUI/src/public/Timer.cs | 2 +- src/Tizen.NUI/src/public/VideoView.cs | 2 +- src/Tizen.NUI/src/public/View.cs | 24 ++++++------ src/Tizen.NUI/src/public/Window.cs | 2 +- 22 files changed, 143 insertions(+), 58 deletions(-) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs index 706185b..2fb9920 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs @@ -116,6 +116,8 @@ namespace DaliTest public void Initialize() { + DowncastTest(); + NavigationPropertiesTests(); OperatorTests(); @@ -705,6 +707,48 @@ namespace DaliTest } } + + + public void DowncastTest() + { + //Create a View as a child of parent View, get it use parent.GetChildAt(i), then DownCast to View handle, but call BackgroundColor property will crash. + View parent = new View(); + View[] childs = new View[5]; + + for (int i = 0; i < 5; i++) + { + childs[i] = new View(); + childs[i].Name = "child_view_" + i; + childs[i].BackgroundColor = Color.Red; + parent.Add(childs[i]); + } + + for (uint i = 0; i < parent.GetChildCount(); i++) + { + Actor child = parent.GetChildAt(i); + View childView = View.DownCast(child); + if (childView) + { + Tizen.Log.Debug("NUI", "Type[" + childView.GetTypeName() + "] BGColor[" + childView.BackgroundColor.R + "]" + " Name[" + childView.Name + "]"); + } + } + + PushButton button = new PushButton(); + button.LabelText = "ButtonTest!"; + button.BackgroundColor = Color.White; + View parentView = new View(); + parentView.Add(button); + PushButton view = PushButton.DownCast(parentView.GetChildAt(0)); + if (view) + { + Tizen.Log.Debug("NUI", "NUI view GetTypeName= " + view.GetTypeName()); + Tizen.Log.Debug("NUI", "NUI view LabelText= " + view.LabelText); + Tizen.Log.Debug("NUI", "NUI view color= " + view.BackgroundColor.R); + } + } + + + /// /// The main entry point for the application. /// diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs index accbf0c..0f82468 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs @@ -95,6 +95,7 @@ namespace FlexContainerTest Tizen.Log.Debug("NUI", "pushbutton1 clicked! add handler!"); _cnt++; FocusManager.Instance.PreFocusChange += Instance_PreFocusChange; + _ani.Finished += _ani_Finished; pushButton1.LabelText = "Add Handler" + _cnt; pushButton2.LabelText = "Remove Handler" + _cnt; return true; @@ -112,6 +113,7 @@ namespace FlexContainerTest Tizen.Log.Debug("NUI", "pushbutton2 clicked! remove handler!"); _cnt--; FocusManager.Instance.PreFocusChange -= Instance_PreFocusChange; + _ani.Finished -= _ani_Finished; pushButton1.LabelText = "Add Handler" + _cnt; pushButton2.LabelText = "Remove Handler" + _cnt; return true; @@ -123,9 +125,15 @@ namespace FlexContainerTest _ani.AnimateTo(pushButton1, "Opacity", 0.0f); _ani.AnimateTo(pushButton2, "Opacity", 0.0f); _ani.EndAction = Animation.EndActions.Discard; + _ani.Finished += _ani_Finished; } + private void _ani_Finished(object sender, EventArgs e) + { + Tizen.Log.Debug("NUI", "_ani finished! _cnt=" + _cnt); + } + private View Instance_PreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e) { View nextView; diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index 602db24..b9f10b4 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -29,7 +29,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;DEBUG_ON;DOT_NET_CORE prompt 4 diff --git a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs index fd51ec5..4ac3920 100755 --- a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs +++ b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs @@ -7,8 +7,8 @@ // Do not make changes to this file unless you know what you are doing--modify // the SWIG interface file instead. //------------------------------------------------------------------------------ -#define DOT_NET_CORE +#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif diff --git a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs index 7560286..e4fcf4a 100755 --- a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs +++ b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs @@ -1,11 +1,11 @@ -#define DOT_NET_CORE -using System; -using System.Runtime.InteropServices; -using System.Collections.Generic; +#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif +using System; +using System.Runtime.InteropServices; +using System.Collections.Generic; namespace Tizen.NUI { diff --git a/src/Tizen.NUI/src/internal/ViewImpl.cs b/src/Tizen.NUI/src/internal/ViewImpl.cs index 9aebd40..e11ab3a 100755 --- a/src/Tizen.NUI/src/internal/ViewImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewImpl.cs @@ -7,8 +7,8 @@ // Do not make changes to this file unless you know what you are doing--modify // the SWIG interface file instead. //------------------------------------------------------------------------------ -#define DOT_NET_CORE +#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif diff --git a/src/Tizen.NUI/src/internal/ViewRegistry.cs b/src/Tizen.NUI/src/internal/ViewRegistry.cs index ee3cc03..a1bf0cd 100755 --- a/src/Tizen.NUI/src/internal/ViewRegistry.cs +++ b/src/Tizen.NUI/src/internal/ViewRegistry.cs @@ -1,11 +1,11 @@ -#define DOT_NET_CORE -using System; -using System.Runtime.InteropServices; -using System.Collections.Generic; +#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif +using System; +using System.Runtime.InteropServices; +using System.Collections.Generic; namespace Tizen.NUI { diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs index 29bfffd..7cbcb66 100755 --- a/src/Tizen.NUI/src/public/Animation.cs +++ b/src/Tizen.NUI/src/public/Animation.cs @@ -102,8 +102,16 @@ namespace Tizen.NUI { if (_animationFinishedEventHandler == null) { +#if DEBUG_ON + Tizen.Log.Debug("NUI", "con1) FinishedSignal().Empty = " + FinishedSignal().Empty()); + Tizen.Log.Debug("NUI", "con2) FinishedSignal().GetConnectionCount = " + FinishedSignal().GetConnectionCount()); +#endif _animationFinishedEventCallback = OnFinished; FinishedSignal().Connect(_animationFinishedEventCallback); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "con3) FinishedSignal().Empty = " + FinishedSignal().Empty()); + Tizen.Log.Debug("NUI", "con4) FinishedSignal().GetConnectionCount = " + FinishedSignal().GetConnectionCount()); +#endif } _animationFinishedEventHandler += value; @@ -112,9 +120,17 @@ namespace Tizen.NUI { _animationFinishedEventHandler -= value; - if (_animationFinishedEventHandler == null && _animationFinishedEventCallback != null) + if (_animationFinishedEventHandler == null && FinishedSignal().Empty() == false) { +#if DEBUG_ON + Tizen.Log.Debug("NUI", "discon1) FinishedSignal().Empty = " + FinishedSignal().Empty()); + Tizen.Log.Debug("NUI", "discon2) FinishedSignal().GetConnectionCount = " + FinishedSignal().GetConnectionCount()); +#endif FinishedSignal().Disconnect(_animationFinishedEventCallback); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "discon3) FinishedSignal().Empty = " + FinishedSignal().Empty()); + Tizen.Log.Debug("NUI", "discon4) FinishedSignal().GetConnectionCount = " + FinishedSignal().GetConnectionCount()); +#endif } } } diff --git a/src/Tizen.NUI/src/public/Button.cs b/src/Tizen.NUI/src/public/Button.cs index d1bb50c..e771933 100755 --- a/src/Tizen.NUI/src/public/Button.cs +++ b/src/Tizen.NUI/src/public/Button.cs @@ -104,7 +104,7 @@ namespace Tizen.NUI { _clickedEventHandler -= value; - if (_clickedEventHandler == null && _clickedCallback != null) + if (_clickedEventHandler == null && ClickedSignal().Empty() == false) { ClickedSignal().Disconnect(_clickedCallback); } @@ -145,7 +145,7 @@ namespace Tizen.NUI { _pressedEventHandler -= value; - if (_pressedEventHandler == null && _pressedCallback != null) + if (_pressedEventHandler == null && PressedSignal().Empty() == false) { this.PressedSignal().Disconnect(_pressedCallback); } @@ -184,7 +184,7 @@ namespace Tizen.NUI { _releasedEventHandler -= value; - if (_releasedEventHandler == null && _releasedCallback != null) + if (_releasedEventHandler == null && ReleasedSignal().Empty() == false) { ReleasedSignal().Disconnect(_releasedCallback); } @@ -224,7 +224,7 @@ namespace Tizen.NUI { _stateChangedEventHandler -= value; - if (_stateChangedEventHandler == null && _stateChangedCallback != null) + if (_stateChangedEventHandler == null && StateChangedSignal().Empty() == false) { StateChangedSignal().Disconnect(_stateChangedCallback); } diff --git a/src/Tizen.NUI/src/public/FocusManager.cs b/src/Tizen.NUI/src/public/FocusManager.cs index 2d4e4aa..fd5f9ff 100755 --- a/src/Tizen.NUI/src/public/FocusManager.cs +++ b/src/Tizen.NUI/src/public/FocusManager.cs @@ -133,17 +133,33 @@ namespace Tizen.NUI { if (_preFocusChangeEventHandler == null) { +#if DEBUG_ON + Tizen.Log.Debug("NUI", "con1) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty()); + Tizen.Log.Debug("NUI", "con2) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount()); +#endif _preFocusChangeCallback = OnPreFocusChange; PreFocusChangeSignal().Connect(_preFocusChangeCallback); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "con3) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty()); + Tizen.Log.Debug("NUI", "con4) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount()); +#endif } _preFocusChangeEventHandler += value; } remove { _preFocusChangeEventHandler -= value; - if (_preFocusChangeEventHandler == null && _preFocusChangeCallback != null) + if (_preFocusChangeEventHandler == null && PreFocusChangeSignal().Empty() == false) { +#if DEBUG_ON + Tizen.Log.Debug("NUI", "discon1) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty()); + Tizen.Log.Debug("NUI", "discon2) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount()); +#endif PreFocusChangeSignal().Disconnect(_preFocusChangeCallback); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "discon3) PreFocusChangeSignal().Empty = " + PreFocusChangeSignal().Empty()); + Tizen.Log.Debug("NUI", "discon4) PreFocusChangeSignal().GetConnectionCount = " + PreFocusChangeSignal().GetConnectionCount()); +#endif } } } @@ -226,7 +242,7 @@ namespace Tizen.NUI { _focusChangedEventHandler -= value; - if (_focusChangedEventCallback == null && _focusChangedEventCallback != null) + if (_focusChangedEventCallback == null && FocusChangedSignal().Empty() == false) { FocusChangedSignal().Disconnect(_focusChangedEventCallback); } @@ -299,7 +315,7 @@ namespace Tizen.NUI { _focusGroupChangedEventHandler -= value; - if (_focusGroupChangedEventCallback == null && _focusGroupChangedEventCallback != null) + if (_focusGroupChangedEventCallback == null && FocusGroupChangedSignal().Empty() == false) { FocusGroupChangedSignal().Disconnect(_focusGroupChangedEventCallback); } @@ -359,7 +375,7 @@ namespace Tizen.NUI { _focusedViewEnterKeyEventHandler -= value; - if (_focusedViewEnterKeyEventCallback == null && _focusedViewEnterKeyEventCallback != null) + if (_focusedViewEnterKeyEventCallback == null && FocusedActorEnterKeySignal().Empty() == false) { FocusedActorEnterKeySignal().Disconnect(_focusedViewEnterKeyEventCallback); } @@ -532,7 +548,8 @@ namespace Tizen.NUI return ret; } - public void SetCustomAlgorithm(ICustomFocusAlgorithm arg0) { + public void SetCustomAlgorithm(ICustomFocusAlgorithm arg0) + { _customAlgorithmInterfaceWrapper = new CustomAlgorithmInterfaceWrapper(); _customAlgorithmInterfaceWrapper.SetFocusAlgorithm(arg0); diff --git a/src/Tizen.NUI/src/public/Popup.cs b/src/Tizen.NUI/src/public/Popup.cs index 78953e5..99c4cb2 100755 --- a/src/Tizen.NUI/src/public/Popup.cs +++ b/src/Tizen.NUI/src/public/Popup.cs @@ -156,7 +156,7 @@ namespace Tizen.NUI remove { _popUpOutsideTouchedEventHandler -= value; - if (_popUpOutsideTouchedEventHandler == null && _popUpOutsideTouchedEventCallbackDelegate != null) + if (_popUpOutsideTouchedEventHandler == null && OutsideTouchedSignal().Empty() == false) { this.OutsideTouchedSignal().Disconnect(_popUpOutsideTouchedEventCallbackDelegate); } @@ -192,7 +192,7 @@ namespace Tizen.NUI remove { _popUpShowingEventHandler -= value; - if (_popUpShowingEventHandler == null && _popUpShowingEventCallbackDelegate != null) + if (_popUpShowingEventHandler == null && ShowingSignal().Empty() == false) { ShowingSignal().Disconnect(_popUpShowingEventCallbackDelegate); } @@ -229,7 +229,7 @@ namespace Tizen.NUI remove { _popUpShownEventHandler -= value; - if (_popUpShownEventHandler == null && _popUpShownEventCallbackDelegate != null) + if (_popUpShownEventHandler == null && ShownSignal().Empty() == false) { ShownSignal().Disconnect(_popUpShownEventCallbackDelegate); } @@ -265,7 +265,7 @@ namespace Tizen.NUI remove { _popUpHidingEventHandler -= value; - if (_popUpHidingEventHandler == null && _popUpHidingEventCallbackDelegate != null) + if (_popUpHidingEventHandler == null && HidingSignal().Empty() == false) { HidingSignal().Disconnect(_popUpHidingEventCallbackDelegate); } @@ -301,7 +301,7 @@ namespace Tizen.NUI remove { _popUpHiddenEventHandler -= value; - if (_popUpHiddenEventHandler == null && _popUpHiddenEventCallbackDelegate != null) + if (_popUpHiddenEventHandler == null && HiddenSignal().Empty() == false) { HiddenSignal().Disconnect(_popUpHiddenEventCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/ProgressBar.cs b/src/Tizen.NUI/src/public/ProgressBar.cs index 2c7353c..63f4964 100755 --- a/src/Tizen.NUI/src/public/ProgressBar.cs +++ b/src/Tizen.NUI/src/public/ProgressBar.cs @@ -148,7 +148,7 @@ namespace Tizen.NUI remove { _progressBarValueChangedEventHandler -= value; - if (_progressBarValueChangedEventHandler == null && _progressBarValueChangedCallbackDelegate != null) + if (_progressBarValueChangedEventHandler == null && ValueChangedSignal().Empty() == false) { ValueChangedSignal().Disconnect(_progressBarValueChangedCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/ScrollBar.cs b/src/Tizen.NUI/src/public/ScrollBar.cs index 0324903..cb8aed6 100755 --- a/src/Tizen.NUI/src/public/ScrollBar.cs +++ b/src/Tizen.NUI/src/public/ScrollBar.cs @@ -134,7 +134,7 @@ namespace Tizen.NUI remove { _scrollBarPanFinishedEventHandler -= value; - if (_scrollBarPanFinishedEventHandler == null && _scrollBarPanFinishedEventCallbackDelegate != null) + if (_scrollBarPanFinishedEventHandler == null && PanFinishedSignal().Empty() == false) { PanFinishedSignal().Disconnect(_scrollBarPanFinishedEventCallbackDelegate); } @@ -171,7 +171,7 @@ namespace Tizen.NUI remove { _scrollBarScrollPositionIntervalReachedEventHandler -= value; - if (_scrollBarScrollPositionIntervalReachedEventHandler == null && _scrollBarScrollPositionIntervalReachedEventCallbackDelegate != null) + if (_scrollBarScrollPositionIntervalReachedEventHandler == null && ScrollPositionIntervalReachedSignal().Empty() == false) { ScrollPositionIntervalReachedSignal().Disconnect(_scrollBarScrollPositionIntervalReachedEventCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/Slider.cs b/src/Tizen.NUI/src/public/Slider.cs index 06ba997..31ea4ee 100755 --- a/src/Tizen.NUI/src/public/Slider.cs +++ b/src/Tizen.NUI/src/public/Slider.cs @@ -231,7 +231,7 @@ namespace Tizen.NUI remove { _sliderValueChangedEventHandler -= value; - if (_sliderValueChangedEventHandler == null && _sliderValueChangedCallbackDelegate != null) + if (_sliderValueChangedEventHandler == null && ValueChangedSignal().Empty() == false) { ValueChangedSignal().Disconnect(_sliderValueChangedCallbackDelegate); } @@ -272,7 +272,7 @@ namespace Tizen.NUI remove { _sliderSlidingFinishedEventHandler -= value; - if (_sliderSlidingFinishedEventHandler == null && _sliderSlidingFinishedCallbackDelegate != null) + if (_sliderSlidingFinishedEventHandler == null && SlidingFinishedSignal().Empty() == false) { SlidingFinishedSignal().Disconnect(_sliderSlidingFinishedCallbackDelegate); } @@ -313,7 +313,7 @@ namespace Tizen.NUI remove { _sliderMarkReachedEventHandler -= value; - if (_sliderMarkReachedEventHandler == null && _sliderMarkReachedCallbackDelegate != null) + if (_sliderMarkReachedEventHandler == null && MarkReachedSignal().Empty() == false) { MarkReachedSignal().Disconnect(_sliderMarkReachedCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/Stage.cs b/src/Tizen.NUI/src/public/Stage.cs index 727c724..6e9e69d 100755 --- a/src/Tizen.NUI/src/public/Stage.cs +++ b/src/Tizen.NUI/src/public/Stage.cs @@ -116,7 +116,7 @@ namespace Tizen.NUI remove { _stageTouchHandler -= value; - if (_stageTouchHandler == null && _stageTouchCallbackDelegate != null) + if (_stageTouchHandler == null && TouchSignal().Empty() == false) { TouchSignal().Disconnect(_stageTouchCallbackDelegate); } @@ -181,7 +181,7 @@ namespace Tizen.NUI remove { _stageWheelHandler -= value; - if (_stageWheelHandler == null && _stageWheelCallbackDelegate != null) + if (_stageWheelHandler == null && WheelEventSignal().Empty() == false) { WheelEventSignal().Disconnect(_stageWheelCallbackDelegate); } @@ -246,7 +246,7 @@ namespace Tizen.NUI remove { _stageKeyHandler -= value; - if (_stageKeyHandler == null && _stageKeyCallbackDelegate != null) + if (_stageKeyHandler == null && KeyEventSignal().Empty() == false) { KeyEventSignal().Disconnect(_stageKeyCallbackDelegate); } @@ -289,7 +289,7 @@ namespace Tizen.NUI remove { _stageEventProcessingFinishedEventHandler -= value; - if (_stageEventProcessingFinishedEventHandler == null && _stageEventProcessingFinishedEventCallbackDelegate != null) + if (_stageEventProcessingFinishedEventHandler == null && EventProcessingFinishedSignal().Empty() == false) { EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate); } @@ -323,7 +323,7 @@ namespace Tizen.NUI remove { _stageContextLostEventHandler -= value; - if (_stageContextLostEventHandler == null && _stageContextLostEventCallbackDelegate != null) + if (_stageContextLostEventHandler == null && ContextLostSignal().Empty() == false) { ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate); } @@ -357,7 +357,7 @@ namespace Tizen.NUI remove { _stageContextRegainedEventHandler -= value; - if (_stageContextRegainedEventHandler == null && _stageContextRegainedEventCallbackDelegate != null) + if (_stageContextRegainedEventHandler == null && ContextRegainedSignal().Empty() == false) { this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate); } @@ -391,7 +391,7 @@ namespace Tizen.NUI remove { _stageSceneCreatedEventHandler -= value; - if (_stageSceneCreatedEventHandler == null && _stageSceneCreatedEventCallbackDelegate != null) + if (_stageSceneCreatedEventHandler == null && SceneCreatedSignal().Empty() == false) { SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/StyleManager.cs b/src/Tizen.NUI/src/public/StyleManager.cs index 17ac80e..68fcb9b 100755 --- a/src/Tizen.NUI/src/public/StyleManager.cs +++ b/src/Tizen.NUI/src/public/StyleManager.cs @@ -139,7 +139,7 @@ namespace Tizen.NUI remove { _styleManagerStyleChangedEventHandler -= value; - if (_styleManagerStyleChangedEventHandler == null && _styleManagerStyleChangedCallbackDelegate != null) + if (_styleManagerStyleChangedEventHandler == null && StyleChangedSignal().Empty() == false) { StyleChangedSignal().Disconnect(_styleManagerStyleChangedCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/TextEditor.cs b/src/Tizen.NUI/src/public/TextEditor.cs index ceb83b1..6161aea 100755 --- a/src/Tizen.NUI/src/public/TextEditor.cs +++ b/src/Tizen.NUI/src/public/TextEditor.cs @@ -127,7 +127,7 @@ namespace Tizen.NUI remove { _textEditorTextChangedEventHandler -= value; - if (_textEditorTextChangedEventHandler == null && _textEditorTextChangedCallbackDelegate != null) + if (_textEditorTextChangedEventHandler == null && TextChangedSignal().Empty() == false) { TextChangedSignal().Disconnect(_textEditorTextChangedCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/TextField.cs b/src/Tizen.NUI/src/public/TextField.cs index a81f554..f6f0496 100755 --- a/src/Tizen.NUI/src/public/TextField.cs +++ b/src/Tizen.NUI/src/public/TextField.cs @@ -153,7 +153,7 @@ namespace Tizen.NUI remove { _textFieldTextChangedEventHandler -= value; - if (_textFieldTextChangedEventHandler == null && _textFieldTextChangedCallbackDelegate != null) + if (_textFieldTextChangedEventHandler == null && TextChangedSignal().Empty() == false) { TextChangedSignal().Disconnect(_textFieldTextChangedCallbackDelegate); } @@ -191,7 +191,7 @@ namespace Tizen.NUI } remove { - if (_textFieldMaxLengthReachedEventHandler == null && _textFieldMaxLengthReachedCallbackDelegate != null) + if (_textFieldMaxLengthReachedEventHandler == null && MaxLengthReachedSignal().Empty() == false) { this.MaxLengthReachedSignal().Disconnect(_textFieldMaxLengthReachedCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/Timer.cs b/src/Tizen.NUI/src/public/Timer.cs index fbe2abe..89e2869 100755 --- a/src/Tizen.NUI/src/public/Timer.cs +++ b/src/Tizen.NUI/src/public/Timer.cs @@ -115,7 +115,7 @@ namespace Tizen.NUI remove { _timerTickEventHandler -= value; - if (_timerTickEventHandler == null && _timerTickCallbackDelegate != null) + if (_timerTickEventHandler == null && TickSignal().Empty() == false) { TickSignal().Disconnect(_timerTickCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/VideoView.cs b/src/Tizen.NUI/src/public/VideoView.cs index b8dfa97..74a5678 100755 --- a/src/Tizen.NUI/src/public/VideoView.cs +++ b/src/Tizen.NUI/src/public/VideoView.cs @@ -125,7 +125,7 @@ namespace Tizen.NUI remove { _videoViewFinishedEventHandler -= value; - if (_videoViewFinishedEventHandler == null && _videoViewFinishedCallbackDelegate != null) + if (_videoViewFinishedEventHandler == null && FinishedSignal().Empty() == false) { FinishedSignal().Disconnect(_videoViewFinishedCallbackDelegate); } diff --git a/src/Tizen.NUI/src/public/View.cs b/src/Tizen.NUI/src/public/View.cs index ad34b10..e877f2e 100755 --- a/src/Tizen.NUI/src/public/View.cs +++ b/src/Tizen.NUI/src/public/View.cs @@ -104,7 +104,7 @@ namespace Tizen.NUI { _keyInputFocusGainedEventHandler -= value; - if (_keyInputFocusGainedEventHandler == null && _keyInputFocusGainedCallback != null) + if (_keyInputFocusGainedEventHandler == null && KeyInputFocusGainedSignal().Empty() == false) { this.KeyInputFocusGainedSignal().Disconnect(_keyInputFocusGainedCallback); } @@ -146,7 +146,7 @@ namespace Tizen.NUI { _keyInputFocusLostEventHandler -= value; - if (_keyInputFocusLostEventHandler == null && _keyInputFocusLostCallback != null) + if (_keyInputFocusLostEventHandler == null && KeyInputFocusLostSignal().Empty() == false) { this.KeyInputFocusLostSignal().Disconnect(_keyInputFocusLostCallback); } @@ -213,7 +213,7 @@ namespace Tizen.NUI { _keyEventHandler -= value; - if (_keyEventHandler == null && _keyCallback != null) + if (_keyEventHandler == null && KeyEventSignal().Empty() == false) { this.KeyEventSignal().Disconnect(_keyCallback); } @@ -260,7 +260,7 @@ namespace Tizen.NUI { _onRelayoutEventHandler -= value; - if (_onRelayoutEventHandler == null && _onRelayoutEventCallback != null) + if (_onRelayoutEventHandler == null && OnRelayoutSignal().Empty() == false) { this.OnRelayoutSignal().Disconnect(_onRelayoutEventCallback); } @@ -329,7 +329,7 @@ namespace Tizen.NUI { _touchDataEventHandler -= value; - if (_touchDataEventHandler == null && _touchDataCallback != null) + if (_touchDataEventHandler == null && TouchSignal().Empty() == false) { this.TouchSignal().Disconnect(_touchDataCallback); } @@ -403,7 +403,7 @@ namespace Tizen.NUI { _hoverEventHandler -= value; - if (_hoverEventHandler == null && _hoverEventCallback != null) + if (_hoverEventHandler == null && HoveredSignal().Empty() == false) { this.HoveredSignal().Disconnect(_hoverEventCallback); } @@ -476,7 +476,7 @@ namespace Tizen.NUI { _wheelEventHandler -= value; - if (_wheelEventHandler == null && _wheelEventCallback != null) + if (_wheelEventHandler == null && WheelEventSignal().Empty() == false) { this.WheelEventSignal().Disconnect(_wheelEventCallback); } @@ -525,7 +525,7 @@ namespace Tizen.NUI { _onStageEventHandler -= value; - if (_onStageEventHandler == null && _onStageEventCallback != null) + if (_onStageEventHandler == null && OnStageSignal().Empty() == false) { this.OnStageSignal().Disconnect(_onStageEventCallback); } @@ -568,7 +568,7 @@ namespace Tizen.NUI { _offStageEventHandler -= value; - if (_offStageEventHandler == null && _offStageEventCallback != null) + if (_offStageEventHandler == null && OffStageSignal().Empty() == false) { this.OffStageSignal().Disconnect(_offStageEventCallback); } @@ -738,10 +738,10 @@ namespace Tizen.NUI } /// - /// Quries whether the view has key input focus. + /// Quries whether the view has focus. /// - /// true if this view has keyboard input focus - public bool HasKeyInputFocus() + /// true if this view has focus + public bool HasFocus() { bool ret = NDalicPINVOKE.View_HasKeyInputFocus(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index 3b59e02..7d7ad51 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -139,7 +139,7 @@ namespace Tizen.NUI { _windowFocusChangedEventHandler -= value; - if (_windowFocusChangedEventHandler == null && _windowFocusChangedEventCallback != null) + if (_windowFocusChangedEventHandler == null && WindowFocusChangedSignal().Empty() == false) { WindowFocusChangedSignal().Disconnect(_windowFocusChangedEventCallback); } -- 2.7.4