{
instance.UpdateState();
}
+
+ if (instance.IsHighlighted)
+ {
+ instance.EmitAccessibilityStatesChangedEvent(AccessibilityStates.Checked, newSelected);
+ }
}
}
},
public static readonly BindableProperty IconPaddingProperty = BindableProperty.Create(nameof(IconPadding), typeof(Extents), typeof(Button), null, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (Button)bindable;
- instance.iconPadding = (Extents)((Extents)newValue).Clone();
- instance.OnTextOrIconUpdated();
+ if (instance.buttonIcon == null)
+ {
+ return;
+ }
+ instance.buttonIcon.Padding = (Extents)newValue;
},
- defaultValueCreator: (bindable) => ((Button)bindable).iconPadding);
+ defaultValueCreator: (bindable) => ((Button)bindable).buttonIcon?.Padding);
/// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty TextPaddingProperty = BindableProperty.Create(nameof(TextPadding), typeof(Extents), typeof(Button), null, propertyChanged: (bindable, oldValue, newValue) =>
{
var instance = (Button)bindable;
- instance.textPadding = (Extents)((Extents)newValue).Clone();
- instance.OnTextOrIconUpdated();
+ if (instance.buttonText == null)
+ {
+ return;
+ }
+ instance.buttonText.Padding = (Extents)newValue;
+ },
+ defaultValueCreator: (bindable) => ((Button)bindable).buttonText?.Padding);
+
+ /// <summary> The bindable property of ItemAlignment. </summary>
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ internal static readonly BindableProperty ItemAlignmentProperty = BindableProperty.Create(nameof(ItemAlignment), typeof(LinearLayout.Alignment), typeof(Button), LinearLayout.Alignment.Center, propertyChanged: (bindable, oldValue, newValue) =>
+ {
+ var instance = (Button)bindable;
+ var newAlignment = (LinearLayout.Alignment)newValue;
+
+ if (instance.itemAlignment != newAlignment)
+ {
+ instance.itemAlignment = newAlignment;
+ instance.LayoutItems();
+ }
+ },
+ defaultValueCreator: (bindable) => ((Button)bindable).itemAlignment);
+
+ /// <summary> The bindable property of ItemSpacing. </summary>
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ internal static readonly BindableProperty ItemSpacingProperty = BindableProperty.Create(nameof(ItemSpacing), typeof(Size2D), typeof(Button), null, propertyChanged: (bindable, oldValue, newValue) =>
+ {
+ var instance = (Button)bindable;
+ instance.itemSpacing = (Size2D)newValue;
+ instance.UpdateSizeAndSpacing();
},
- defaultValueCreator: (bindable) => ((Button)bindable).textPadding);
+ defaultValueCreator: (bindable) => ((Button)bindable).itemSpacing);
private IconOrientation? iconRelativeOrientation = IconOrientation.Left;
private bool isSelected = false;
private bool isSelectable = false;
private bool isEnabled = true;
- private Extents iconPadding;
- private Extents textPadding;
+ private Size2D itemSpacing;
+ private LinearLayout.Alignment itemAlignment = LinearLayout.Alignment.Center;
static Button() { }
protected override AccessibilityStates AccessibilityCalculateStates()
{
var states = base.AccessibilityCalculateStates();
- states.Set(AccessibilityState.Checked, this.IsSelected);
- states.Set(AccessibilityState.Enabled, this.IsEnabled);
+ FlagSetter(ref states, AccessibilityStates.Checked, this.IsSelected);
+ FlagSetter(ref states, AccessibilityStates.Enabled, this.IsEnabled);
return states;
}
}
/// <summary>
- /// Return currently applied style.
+ /// The last applied style object copy.
/// </summary>
/// <remarks>
/// Modifying contents in style may cause unexpected behaviour.
if (IsHighlighted && String.IsNullOrEmpty(AccessibilityName) && GetAccessibilityNameSignal().Empty())
{
- EmitAccessibilityEvent(ObjectPropertyChangeEvent.Name);
+ EmitAccessibilityEvent(AccessibilityPropertyChangeEvent.Name);
}
}
}
/// <since_tizen> 6 </since_tizen>
public StringSelector TextSelector
{
- get => buttonText == null ? null : new StringSelector((Selector<string>)buttonText.GetValue(TextLabel.TextSelectorProperty));
+ get => buttonText == null ? null : new StringSelector(buttonText.TextSelector);
set
{
if (value == null || buttonText == null)
}
else
{
- buttonText.SetValue(TextLabel.TextSelectorProperty, value);
+ buttonText.TextSelector = value;
}
}
}
/// <since_tizen> 6 </since_tizen>
public StringSelector TranslatableTextSelector
{
- get => buttonText == null ? null : new StringSelector((Selector<string>)buttonText.GetValue(TextLabel.TranslatableTextSelectorProperty));
+ get => buttonText == null ? null : new StringSelector(buttonText.TranslatableTextSelector);
set
{
if (value == null || buttonText == null)
}
else
{
- buttonText.SetValue(TextLabel.TranslatableTextSelectorProperty, value);
+ buttonText.TranslatableTextSelector = value;
}
}
}
/// <since_tizen> 6 </since_tizen>
public ColorSelector TextColorSelector
{
- get => buttonText == null ? null : new ColorSelector((Selector<Color>)buttonText.GetValue(TextLabel.TextColorSelectorProperty));
+ get => buttonText == null ? null : new ColorSelector(buttonText.TextColorSelector);
set
{
if (value == null || buttonText == null)
}
else
{
- buttonText.SetValue(TextLabel.TextColorSelectorProperty, value);
+ buttonText.TextColorSelector = value;
}
}
}
/// <since_tizen> 6 </since_tizen>
public FloatSelector PointSizeSelector
{
- get => buttonText == null ? null : new FloatSelector((Selector<float?>)buttonText.GetValue(TextLabel.PointSizeSelectorProperty));
+ get => buttonText == null ? null : new FloatSelector(buttonText.PointSizeSelector);
set
{
if (value == null || buttonText == null)
}
else
{
- buttonText.SetValue(TextLabel.PointSizeSelectorProperty, value);
+ buttonText.PointSizeSelector = value;
}
}
}
/// <since_tizen> 6 </since_tizen>
public StringSelector IconURLSelector
{
- get => buttonIcon == null ? null : new StringSelector((Selector<string>)buttonIcon.GetValue(ImageView.ResourceUrlSelectorProperty));
+ get => buttonIcon == null ? null : new StringSelector(buttonIcon.ResourceUrlSelector);
set
{
if (value == null || buttonIcon == null)
}
else
{
- buttonIcon.SetValue(ImageView.ResourceUrlSelectorProperty, value);
+ buttonIcon.ResourceUrlSelector = value;
}
}
}
}
/// <summary>
- /// Icon padding in Button, work only when show icon and text.
+ /// Icon padding in Button. It is shortcut of Icon.Padding.
/// </summary>
/// <since_tizen> 6 </since_tizen>
public Extents IconPadding
}
/// <summary>
- /// Text padding in Button, work only when show icon and text.
+ /// Text padding in Button. It is shortcut of TextLabel.Padding.
/// </summary>
/// <since_tizen> 6 </since_tizen>
public Extents TextPadding
}
/// <summary>
+ /// The item (text or icon or both) alignment.
+ /// </summary>
+ /// <since_tizen> 9 </since_tizen>
+ public LinearLayout.Alignment ItemAlignment
+ {
+ get => (LinearLayout.Alignment)GetValue(ItemAlignmentProperty);
+ set => SetValue(ItemAlignmentProperty, value);
+ }
+
+ /// <summary>
+ /// The space between icon and text.
+ /// The value is applied when there exist icon and text both.
+ /// The width value is used when the items are arranged horizontally. Otherwise, the height value is used.
+ /// </summary>
+ /// <since_tizen> 9 </since_tizen>
+ public Size2D ItemSpacing
+ {
+ get => (Size2D)GetValue(ItemSpacingProperty);
+ set => SetValue(ItemSpacingProperty, value);
+ }
+
+ /// <summary>
/// Called after a key event is received by the view that has had its focus set.
/// </summary>
/// <param name="key">The key event.</param>
Extension = buttonStyle.CreateExtension();
if (buttonStyle.Overlay != null)
- {
+ {
OverlayImage?.ApplyStyle(buttonStyle.Overlay);
}
if (Extension != null)
{
buttonIcon.Unparent();
- buttonIcon.Relayout -= OnIconRelayout;
buttonIcon = Extension.OnCreateIcon(this, buttonIcon);
- buttonIcon.Relayout += OnIconRelayout;
buttonText.Unparent();
- buttonText.Relayout -= OnTextRelayout;
buttonText = Extension.OnCreateText(this, buttonText);
- buttonText.Relayout += OnTextRelayout;
LayoutItems();
}
if (buttonStyle.Text != null)
{
+ buttonText.ThemeChangeSensitive = false;
buttonText.ApplyStyle(buttonStyle.Text);
}
projects / platform / core / csapi / tizenfx.git / blobdiff