Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sample test for button click event. Do not merge. #9

Open
wants to merge 8 commits into
base: DevelNUI
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
/test/Tizen.NUI.ComponentApplication/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst
/test/Tizen.NUI.Samples/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst
/test/Tizen.NUI.SeamlessSamples/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst
/test/Tizen.NUI.StyleGuide/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst
/test/Tizen.NUI.Tests/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst
/test/Tizen.NUI.WebViewTest/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst
/test/Tizen.NUI.WindowSystem.Samples/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst

# Please Add more Code Owners below.
# Please Add more Code Owners below.
11 changes: 6 additions & 5 deletions src/Tizen.NUI.Components/Controls/AlertDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -472,13 +472,14 @@ public override void OnInitialize()
/// Informs AT-SPI bridge about the set of AT-SPI states associated with this object.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
protected override AccessibilityStates AccessibilityCalculateStates(ulong states)
protected override AccessibilityStates AccessibilityCalculateStates()
{
var accessibilityStates = base.AccessibilityCalculateStates(states);
FlagSetter(ref accessibilityStates, AccessibilityStates.Modal, true);
return accessibilityStates;
}
var states = base.AccessibilityCalculateStates();

states[AccessibilityState.Modal] = true;

return states;
}

/// <summary>
/// Default title content of AlertDialog.
Expand Down
14 changes: 8 additions & 6 deletions src/Tizen.NUI.Components/Controls/Button.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public partial class Button : Control

if (Accessibility.Accessibility.IsEnabled && instance.IsHighlighted)
{
instance.EmitAccessibilityStatesChangedEvent(AccessibilityStates.Checked, newSelected);
instance.EmitAccessibilityStateChangedEvent(AccessibilityState.Checked, newSelected);
}
}
}
Expand Down Expand Up @@ -217,12 +217,14 @@ public Button(ButtonStyle buttonStyle) : base(buttonStyle)
/// Calculates current states for the button<br />
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
protected override AccessibilityStates AccessibilityCalculateStates(ulong states)
protected override AccessibilityStates AccessibilityCalculateStates()
{
var accessibilityStates = base.AccessibilityCalculateStates(states);
FlagSetter(ref accessibilityStates, AccessibilityStates.Checked, this.IsSelected);
FlagSetter(ref accessibilityStates, AccessibilityStates.Enabled, this.IsEnabled);
return accessibilityStates;
var states = base.AccessibilityCalculateStates();

states[AccessibilityState.Checked] = this.IsSelected;
states[AccessibilityState.Enabled] = this.IsEnabled;

return states;
}

/// <summary>
Expand Down
10 changes: 6 additions & 4 deletions src/Tizen.NUI.Components/Controls/Dialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,13 @@ public override void OnInitialize()
/// Informs AT-SPI bridge about the set of AT-SPI states associated with this object.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
protected override AccessibilityStates AccessibilityCalculateStates(ulong states)
protected override AccessibilityStates AccessibilityCalculateStates()
{
var accessibilityStates = base.AccessibilityCalculateStates(states);
FlagSetter(ref accessibilityStates, AccessibilityStates.Modal, true);
return accessibilityStates;
var states = base.AccessibilityCalculateStates();

states[AccessibilityState.Modal] = true;

return states;
}

private void OnRelayout(object sender, EventArgs e)
Expand Down
14 changes: 8 additions & 6 deletions src/Tizen.NUI.Components/Controls/Menu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ public void Post(Window window = null)

CalculateSizeAndPosition();
RegisterDefaultLabel();
NotifyAccessibilityStatesChange(AccessibilityStates.Visible | AccessibilityStates.Showing, AccessibilityStatesNotifyMode.Recursive);
NotifyAccessibilityStatesChange(new AccessibilityStates(AccessibilityState.Visible, AccessibilityState.Showing), AccessibilityStatesNotifyMode.Recursive);
}

/// <summary>
Expand All @@ -407,7 +407,7 @@ public void Dismiss()
{
Hide();
UnregisterDefaultLabel();
NotifyAccessibilityStatesChange(AccessibilityStates.Visible | AccessibilityStates.Showing, AccessibilityStatesNotifyMode.Recursive);
NotifyAccessibilityStatesChange(new AccessibilityStates(AccessibilityState.Visible, AccessibilityState.Showing), AccessibilityStatesNotifyMode.Recursive);
Dispose();
}

Expand Down Expand Up @@ -660,11 +660,13 @@ public override void OnInitialize()
/// Informs AT-SPI bridge about the set of AT-SPI states associated with this object.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
protected override AccessibilityStates AccessibilityCalculateStates(ulong states)
protected override AccessibilityStates AccessibilityCalculateStates()
{
var accessibilityStates = base.AccessibilityCalculateStates(states);
FlagSetter(ref accessibilityStates, AccessibilityStates.Modal, true);
return accessibilityStates;
var states = base.AccessibilityCalculateStates();

states[AccessibilityState.Modal] = true;

return states;
}
}
}
4 changes: 2 additions & 2 deletions src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -863,14 +863,14 @@ private void NotifyAccessibilityStatesChangeOfPages(Page disappearedPage, Page a
View curHighlightedView = Accessibility.Accessibility.Instance.GetCurrentlyHighlightedView();
if (curHighlightedView != null)
{
curHighlightedView.NotifyAccessibilityStatesChange(AccessibilityStates.Visible | AccessibilityStates.Showing, AccessibilityStatesNotifyMode.Single);
curHighlightedView.NotifyAccessibilityStatesChange(new AccessibilityStates(AccessibilityState.Visible, AccessibilityState.Showing), AccessibilityStatesNotifyMode.Single);
}
}

if (appearedPage != null)
{
appearedPage.RegisterDefaultLabel();
appearedPage.NotifyAccessibilityStatesChange(AccessibilityStates.Visible | AccessibilityStates.Showing, AccessibilityStatesNotifyMode.Single);
appearedPage.NotifyAccessibilityStatesChange(new AccessibilityStates(AccessibilityState.Visible, AccessibilityState.Showing), AccessibilityStatesNotifyMode.Single);
}
}

Expand Down
10 changes: 6 additions & 4 deletions src/Tizen.NUI.Components/Controls/Popup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -810,11 +810,13 @@ public override void OnInitialize()
/// Informs AT-SPI bridge about the set of AT-SPI states associated with this object.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
protected override AccessibilityStates AccessibilityCalculateStates(ulong states)
protected override AccessibilityStates AccessibilityCalculateStates()
{
var accessibilityStates = base.AccessibilityCalculateStates(states);
FlagSetter(ref accessibilityStates, AccessibilityStates.Modal, true);
return accessibilityStates;
var states = base.AccessibilityCalculateStates();

states[AccessibilityState.Modal] = true;

return states;
}

private void UpdateView()
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.NUI.Components/Controls/SelectButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ protected override void OnControlStateChanged(ControlStateChangedEventArgs info)
{
if (Accessibility.Accessibility.IsEnabled && IsHighlighted)
{
EmitAccessibilityStatesChangedEvent(AccessibilityStates.Checked, info.CurrentState.Contains(ControlState.Selected));
EmitAccessibilityStateChangedEvent(AccessibilityState.Checked, info.CurrentState.Contains(ControlState.Selected));
}

// SelectedChanged is invoked when button or key is unpressed.
Expand Down
12 changes: 7 additions & 5 deletions src/Tizen.NUI.Components/Controls/Switch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,13 @@ public override void OnInitialize()
/// Informs AT-SPI bridge about the set of AT-SPI states associated with this object.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
protected override AccessibilityStates AccessibilityCalculateStates(ulong states)
protected override AccessibilityStates AccessibilityCalculateStates()
{
var accessibilityStates = base.AccessibilityCalculateStates(states);
FlagSetter(ref accessibilityStates, AccessibilityStates.Checked, this.IsSelected);
return accessibilityStates;
var states = base.AccessibilityCalculateStates();

states[AccessibilityState.Checked] = this.IsSelected;

return states;
}

/// <summary>
Expand Down Expand Up @@ -367,7 +369,7 @@ private void OnSelect()
{
if (Accessibility.Accessibility.IsEnabled && IsHighlighted)
{
EmitAccessibilityStatesChangedEvent(AccessibilityStates.Checked, IsSelected);
EmitAccessibilityStateChangedEvent(AccessibilityState.Checked, IsSelected);
}

((SwitchExtension)Extension)?.OnSelectedChanged(this);
Expand Down
20 changes: 10 additions & 10 deletions src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,24 +122,20 @@ internal static partial class ControlDevel
public static extern bool DaliToolkitDevelControlGrabAccessibilityHighlight(global::System.Runtime.InteropServices.HandleRef arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_GetAccessibilityState")]
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_GetAccessibilityStates")]
public static extern ulong DaliToolkitDevelControlGetAccessibilityStates(global::System.Runtime.InteropServices.HandleRef arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ConvertState")]
public static extern IntPtr DaliToolkitDevelControlConvertState(ulong arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_NotifyAccessibilityStateChange2")]
public static extern global::System.IntPtr DaliToolkitDevelControlNotifyAccessibilityStatesChange(global::System.Runtime.InteropServices.HandleRef arg1, ulong arg2, int arg3);
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_NotifyAccessibilityStateChange")]
public static extern global::System.IntPtr DaliToolkitDevelControlNotifyAccessibilityStateChange(global::System.Runtime.InteropServices.HandleRef arg1, ulong arg2, int arg3);

[EditorBrowsable(EditorBrowsableState.Never)]
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_EmitAccessibilityEvent")]
public static extern global::System.IntPtr DaliAccessibilityEmitAccessibilityEvent(global::System.Runtime.InteropServices.HandleRef arg1, int arg2_event);

[EditorBrowsable(EditorBrowsableState.Never)]
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_EmitAccessibilityStateChangedEvent2")]
public static extern global::System.IntPtr DaliAccessibilityEmitAccessibilityStatesChangedEvent(global::System.Runtime.InteropServices.HandleRef arg1, ulong arg2_state, int arg3);
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_EmitAccessibilityStateChangedEvent")]
public static extern global::System.IntPtr DaliAccessibilityEmitAccessibilityStateChangedEvent(global::System.Runtime.InteropServices.HandleRef arg1, int arg2_state, int arg3);

[EditorBrowsable(EditorBrowsableState.Never)]
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_EmitTextInsertedEvent")]
Expand Down Expand Up @@ -203,8 +199,12 @@ public class AccessibilityDelegate
[EditorBrowsable(EditorBrowsableState.Never)]
public AccessibilityDoAction DoAction; // 3

// Note: this method departs from the usual idiom of having the same
// parameter types as the Accessible method in DALi, because states
// calculated by ControlAccessible::CalculateStates are passed here
// as a parameter.
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate IntPtr AccessibilityCalculateStates(ulong states);
public delegate ulong AccessibilityCalculateStates(ulong states);
[EditorBrowsable(EditorBrowsableState.Never)]
public AccessibilityCalculateStates CalculateStates; // 4

Expand Down
11 changes: 10 additions & 1 deletion src/Tizen.NUI/src/internal/Interop/Interop.Window.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,18 @@ internal static partial class Window
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_SetTransparency")]
public static extern global::System.IntPtr SetTransparency(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedKeyEvent")]
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedKey_Default_Window")]
public static extern void FeedKeyEvent(global::System.Runtime.InteropServices.HandleRef jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedKey")]
public static extern void FeedKeyEvent(global::System.Runtime.InteropServices.HandleRef window, global::System.Runtime.InteropServices.HandleRef keyEvent);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedTouch")]
public static extern void FeedTouchPoint(global::System.Runtime.InteropServices.HandleRef window, global::System.Runtime.InteropServices.HandleRef touchPoint, int timeStamp);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedWheel")]
public static extern void FeedWheelEvent(global::System.Runtime.InteropServices.HandleRef window, global::System.Runtime.InteropServices.HandleRef wheelEvent);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Adaptor_RenderOnce")]
public static extern void RenderOnce(global::System.Runtime.InteropServices.HandleRef jarg1);

Expand Down
1 change: 1 addition & 0 deletions src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1426,6 +1426,7 @@ public float ScrollBarFadeDuration
/// The size of font in pixels.<br />
/// </summary>
/// <since_tizen> 3 </since_tizen>
[Binding.TypeConverter(typeof(FloatGraphicsTypeConverter))]
public float PixelSize
{
get
Expand Down
1 change: 1 addition & 0 deletions src/Tizen.NUI/src/public/BaseComponents/TextField.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1683,6 +1683,7 @@ public HiddenInput GetHiddenInput()
/// The size of font in pixels.<br />
/// </summary>
/// <since_tizen> 3 </since_tizen>
[Binding.TypeConverter(typeof(FloatGraphicsTypeConverter))]
public float PixelSize
{
get
Expand Down
1 change: 1 addition & 0 deletions src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,7 @@ public Strikethrough GetStrikethrough()
/// The size of font in pixels.<br />
/// </summary>
/// <since_tizen> 3 </since_tizen>
[Binding.TypeConverter(typeof(FloatGraphicsTypeConverter))]
public float PixelSize
{
get
Expand Down
4 changes: 2 additions & 2 deletions src/Tizen.NUI/src/public/BaseComponents/View.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2436,7 +2436,7 @@ public Extents Margin
/// </code>
/// </example>
/// <since_tizen> 6 </since_tizen>
[Binding.TypeConverter(typeof(IntDpTypeConverter))]
[Binding.TypeConverter(typeof(IntGraphicsTypeConverter))]
public int WidthSpecification
{
get
Expand Down Expand Up @@ -2493,7 +2493,7 @@ private int InternalWidthSpecification
/// </code>
/// </example>
/// <since_tizen> 6 </since_tizen>
[Binding.TypeConverter(typeof(IntDpTypeConverter))]
[Binding.TypeConverter(typeof(IntGraphicsTypeConverter))]
public int HeightSpecification
{
get
Expand Down
Loading