X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.NUI.Components%2FControls%2FPopup.cs;h=f046782ce06737aedbb1c18db8ca861a375dfd37;hb=df054bbf5c249915d78db8b05dfa7542c96a5af3;hp=502733164d672c2033db50599dded65a007aaad3;hpb=ee309889f0a3c7ce29b544206fc2dee83522bc10;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git diff --git a/src/Tizen.NUI.Components/Controls/Popup.cs b/src/Tizen.NUI.Components/Controls/Popup.cs index 5027331..f046782 100755 --- a/src/Tizen.NUI.Components/Controls/Popup.cs +++ b/src/Tizen.NUI.Components/Controls/Popup.cs @@ -27,7 +27,7 @@ namespace Tizen.NUI.Components /// /// 6 [Obsolete("Deprecated in API8; Will be removed in API10")] - public class Popup : Control + public partial class Popup : Control { /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -328,6 +328,18 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public string TitleText { + get + { + return GetValue(TitleTextProperty) as string; + } + set + { + SetValue(TitleTextProperty, value); + NotifyPropertyChanged(); + } + } + private string InternalTitleText + { get => Title.Text; set => Title.Text = value; } @@ -339,6 +351,18 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public float TitlePointSize { + get + { + return (float)GetValue(TitlePointSizeProperty); + } + set + { + SetValue(TitlePointSizeProperty, value); + NotifyPropertyChanged(); + } + } + private float InternalTitlePointSize + { get => Title.PointSize; set => Title.PointSize = value; } @@ -350,6 +374,18 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public Color TitleTextColor { + get + { + return GetValue(TitleTextColorProperty) as Color; + } + set + { + SetValue(TitleTextColorProperty, value); + NotifyPropertyChanged(); + } + } + private Color InternalTitleTextColor + { get => Title.TextColor; set => Title.TextColor = value; } @@ -361,6 +397,18 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public HorizontalAlignment TitleTextHorizontalAlignment { + get + { + return (HorizontalAlignment)GetValue(TitleTextHorizontalAlignmentProperty); + } + set + { + SetValue(TitleTextHorizontalAlignmentProperty, value); + NotifyPropertyChanged(); + } + } + private HorizontalAlignment InternalTitleTextHorizontalAlignment + { get => Title.HorizontalAlignment; set => Title.HorizontalAlignment = value; } @@ -372,6 +420,18 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public Position TitleTextPosition { + get + { + return GetValue(TitleTextPositionProperty) as Position; + } + set + { + SetValue(TitleTextPositionProperty, value); + NotifyPropertyChanged(); + } + } + private Position InternalTitleTextPosition + { get => Title.Position; set => Title.Position = value; } @@ -383,6 +443,18 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public int TitleHeight { + get + { + return (int)GetValue(TitleHeightProperty); + } + set + { + SetValue(TitleHeightProperty, value); + NotifyPropertyChanged(); + } + } + private int InternalTitleHeight + { get => (int)Title.SizeHeight; set => Title.SizeHeight = (int)value; } @@ -405,6 +477,18 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public int ButtonCount { + get + { + return (int)GetValue(ButtonCountProperty); + } + set + { + SetValue(ButtonCountProperty, value); + NotifyPropertyChanged(); + } + } + private int InternalButtonCount + { get; set; } @@ -698,8 +782,7 @@ namespace Tizen.NUI.Components public override void OnInitialize() { base.OnInitialize(); - SetAccessibilityConstructor(Role.Dialog); - AppendAccessibilityAttribute("sub-role", "Alert"); + AccessibilityRole = Role.Dialog; container.Add(this); container.SetTouchConsumed(true); @@ -729,7 +812,9 @@ namespace Tizen.NUI.Components protected override AccessibilityStates AccessibilityCalculateStates() { var states = base.AccessibilityCalculateStates(); - FlagSetter(ref states, AccessibilityStates.Modal, true); + + states[AccessibilityState.Modal] = true; + return states; } @@ -759,7 +844,7 @@ namespace Tizen.NUI.Components private void PopupStylePropertyChanged(object sender, PropertyChangedEventArgs e) { - if (e.PropertyName.Equals("LayoutDirection")) + if (e.PropertyName is var propName && propName != null && propName.Equals("LayoutDirection")) { btGroup.UpdateButton(buttonStyle); }