From: Jiyun Yang Date: Fri, 30 Oct 2020 09:20:50 +0000 (+0900) Subject: [NUI] Change type of Selector.StateValueList to IList (#2149) X-Git-Tag: submit/tizen/20201030.161430~1^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8498232797ebdf6e5f7a162733f1ce0b27e0d548;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Change type of Selector.StateValueList to IList (#2149) This is tempopary error fix to sync with fhub-nui without full build. Signed-off-by: Jiyun Yang --- diff --git a/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs b/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs index ac8fa6f..e2608b5 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI.BaseComponents /// The list for adding state-value pair. /// [EditorBrowsable(EditorBrowsableState.Never)] - public List> StateValueList { get; set; } = new List>(); + public IList> StateValueList { get; set; } = new List>(); /// /// Adds the specified state and value. @@ -55,7 +55,7 @@ namespace Tizen.NUI.BaseComponents public void Add(StateValuePair stateValuePair) { // To prevent a state from having multiple values, remove existing state-value pair. - int index = StateValueList.FindIndex(x => x.State == stateValuePair.State); + int index = ((List>)StateValueList).FindIndex(x => x.State == stateValuePair.State); if (index != -1) StateValueList.RemoveAt(index); @@ -108,7 +108,7 @@ namespace Tizen.NUI.BaseComponents [EditorBrowsable(EditorBrowsableState.Never)] public T Normal { - get => StateValueList.Find(x => x.State == ControlState.Normal).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.Normal).Value; set => Add(ControlState.Normal, value); } /// @@ -120,7 +120,7 @@ namespace Tizen.NUI.BaseComponents public T Pressed { - get => StateValueList.Find(x => x.State == ControlState.Pressed).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.Pressed).Value; set => Add(ControlState.Pressed, value); } /// @@ -131,7 +131,7 @@ namespace Tizen.NUI.BaseComponents [EditorBrowsable(EditorBrowsableState.Never)] public T Focused { - get => StateValueList.Find(x => x.State == ControlState.Focused).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.Focused).Value; set => Add(ControlState.Focused, value); } /// @@ -142,7 +142,7 @@ namespace Tizen.NUI.BaseComponents [EditorBrowsable(EditorBrowsableState.Never)] public T Selected { - get => StateValueList.Find(x => x.State == ControlState.Selected).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.Selected).Value; set => Add(ControlState.Selected, value); } /// @@ -154,7 +154,7 @@ namespace Tizen.NUI.BaseComponents public T Disabled { - get => StateValueList.Find(x => x.State == ControlState.Disabled).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.Disabled).Value; set => Add(ControlState.Disabled, value); } /// @@ -165,7 +165,7 @@ namespace Tizen.NUI.BaseComponents [EditorBrowsable(EditorBrowsableState.Never)] public T DisabledFocused { - get => StateValueList.Find(x => x.State == ControlState.DisabledFocused).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.DisabledFocused).Value; set => Add(ControlState.DisabledFocused, value); } /// @@ -175,7 +175,7 @@ namespace Tizen.NUI.BaseComponents /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. public T SelectedFocused { - get => StateValueList.Find(x => x.State == ControlState.SelectedFocused).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.SelectedFocused).Value; set => Add(ControlState.SelectedFocused, value); } /// @@ -187,7 +187,7 @@ namespace Tizen.NUI.BaseComponents public T DisabledSelected { - get => StateValueList.Find(x => x.State == ControlState.DisabledSelected).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.DisabledSelected).Value; set => Add(ControlState.DisabledSelected, value); } @@ -199,7 +199,7 @@ namespace Tizen.NUI.BaseComponents [EditorBrowsable(EditorBrowsableState.Never)] public T Other { - get => StateValueList.Find(x => x.State == ControlState.Other).Value; + get => ((List>)StateValueList).Find(x => x.State == ControlState.Other).Value; set => Add(ControlState.Other, value); } @@ -227,7 +227,7 @@ namespace Tizen.NUI.BaseComponents result = default; - int index = StateValueList.FindIndex(x => x.State == state); + int index = ((List>)StateValueList).FindIndex(x => x.State == state); if (index >= 0) { result = StateValueList[index].Value; @@ -236,7 +236,7 @@ namespace Tizen.NUI.BaseComponents if (state.IsCombined) { - index = StateValueList.FindIndex(x => state.Contains(x.State)); + index = ((List>)StateValueList).FindIndex(x => state.Contains(x.State)); if (index >= 0) { result = StateValueList[index].Value; @@ -244,7 +244,7 @@ namespace Tizen.NUI.BaseComponents } } - index = StateValueList.FindIndex(x => x.State == ControlState.Other); + index = ((List>)StateValueList).FindIndex(x => x.State == ControlState.Other); if (index >= 0) { result = StateValueList[index].Value; @@ -301,12 +301,12 @@ namespace Tizen.NUI.BaseComponents if (cloneable) { All = (T)((ICloneable)other.All)?.Clone(); - StateValueList = other.StateValueList.ConvertAll(m => new StateValuePair(m.State, (T)((ICloneable)m.Value)?.Clone())); + StateValueList = ((List>)other.StateValueList).ConvertAll(m => new StateValuePair(m.State, (T)((ICloneable)m.Value)?.Clone())); } else { All = other.All; - StateValueList = other.StateValueList.ConvertAll(m => m); + StateValueList = ((List>)other.StateValueList).ConvertAll(m => m); } }