Skip to content

Commit

Permalink
[NUI] Remove signal type member variables in View & Builder.
Browse files Browse the repository at this point in the history
  • Loading branch information
huayongxu committed Jan 23, 2025
1 parent 77ee0d9 commit 2c1a96f
Show file tree
Hide file tree
Showing 7 changed files with 230 additions and 215 deletions.
121 changes: 121 additions & 0 deletions src/Tizen.NUI/src/internal/Interop/Interop.AccessibilitySignal.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/*
* Copyright(c) 2025 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

namespace Tizen.NUI
{
internal static partial class Interop
{
internal static class AccessibilitySignal
{
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityDoGestureSignal_Connect")]
public static extern void AccessibilityDoGestureConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityDoGestureSignal_Disconnect")]
public static extern void AccessibilityDoGestureDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityGetNameSignal_Connect")]
public static extern void AccessibilityGetNameConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityGetNameSignal_Disconnect")]
public static extern void AccessibilityGetNameDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityGetDescriptionSignal_Connect")]
public static extern void AccessibilityGetDescriptionConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityGetDescriptionSignal_Disconnect")]
public static extern void AccessibilityGetDescriptionDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityActivateSignal_Connect")]
public static extern void AccessibilityActivateConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityActivateSignal_Disconnect")]
public static extern void AccessibilityActivateDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityActivateSignal_Empty")]
[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)]
public static extern bool AccessibilityActivateEmpty(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityActivateSignal_Emit")]
public static extern void AccessibilityActivateEmit(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingSkippedSignal_Connect")]
public static extern void AccessibilityReadingSkippedConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingSkippedSignal_Disconnect")]
public static extern void AccessibilityReadingSkippedDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingSkippedSignal_Empty")]
[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)]
public static extern bool AccessibilityReadingSkippedEmpty(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingSkippedSignal_Emit")]
public static extern void AccessibilityReadingSkippedEmit(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingPausedSignal_Connect")]
public static extern void AccessibilityReadingPausedConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingPausedSignal_Disconnect")]
public static extern void AccessibilityReadingPausedDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingPausedSignal_Empty")]
[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)]
public static extern bool AccessibilityReadingPausedEmpty(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingPausedSignal_Emit")]
public static extern void AccessibilityReadingPausedEmit(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingResumedSignal_Connect")]
public static extern void AccessibilityReadingResumedConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingResumedSignal_Disconnect")]
public static extern void AccessibilityReadingResumedDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingResumedSignal_Empty")]
[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)]
public static extern bool AccessibilityReadingResumedEmpty(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingResumedSignal_Emit")]
public static extern void AccessibilityReadingResumedEmit(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingCancelledSignal_Connect")]
public static extern void AccessibilityReadingCancelledConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingCancelledSignal_Disconnect")]
public static extern void AccessibilityReadingCancelledDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingCancelledSignal_Empty")]
[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)]
public static extern bool AccessibilityReadingCancelledEmpty(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingCancelledSignal_Emit")]
public static extern void AccessibilityReadingCancelledEmit(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingStoppedSignal_Connect")]
public static extern void AccessibilityReadingStoppedConnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingStoppedSignal_Disconnect")]
public static extern void AccessibilityReadingStoppedDisconnect(BaseComponents.View.ControlHandle jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingStoppedSignal_Empty")]
[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)]
public static extern bool AccessibilityReadingStoppedEmpty(BaseComponents.View.ControlHandle jarg1);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingStoppedSignal_Emit")]
public static extern void AccessibilityReadingStoppedEmit(BaseComponents.View.ControlHandle jarg1);
}
}
}
7 changes: 5 additions & 2 deletions src/Tizen.NUI/src/internal/Interop/Interop.Builder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,11 @@ internal static partial class Builder
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Builder_GetLinearConstrainer")]
public static extern global::System.IntPtr GetLinearConstrainer(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Builder_QuitSignal")]
public static extern global::System.IntPtr QuitSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Builder_QuitSignal_Connect")]
public static extern global::System.IntPtr QuitConnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);

[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Builder_QuitSignal_Disconnect")]
public static extern global::System.IntPtr QuitDisconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
}
}
}
36 changes: 0 additions & 36 deletions src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,42 +27,6 @@ internal static partial class Interop
{
internal static partial class ControlDevel
{
[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityActivateSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityActivateSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingSkippedSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityReadingSkippedSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingPausedSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityReadingPausedSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingResumedSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityReadingResumedSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingCancelledSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityReadingCancelledSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityReadingStoppedSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityReadingStoppedSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityGetNameSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityGetNameSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityGetDescriptionSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityGetDescriptionSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityDoGestureSignal")]
public static extern IntPtr DaliToolkitDevelControlAccessibilityDoGestureSignal(BaseComponents.View.ControlHandle arg1);

[EditorBrowsable(EditorBrowsableState.Never)]
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AppendAccessibilityRelation")]
public static extern void DaliToolkitDevelControlAppendAccessibilityRelation(HandleRef arg1, HandleRef arg2, int arg3);
Expand Down
17 changes: 5 additions & 12 deletions src/Tizen.NUI/src/internal/Utility/Builder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public class QuitEventArgs : EventArgs
private delegate void QuitEventCallbackDelegate();
private DaliEventHandler<object, QuitEventArgs> builderQuitEventHandler;
private QuitEventCallbackDelegate builderQuitEventCallbackDelegate;
private VoidSignal quitSignal;

public event DaliEventHandler<object, QuitEventArgs> Quit
{
Expand All @@ -51,9 +50,9 @@ public event DaliEventHandler<object, QuitEventArgs> Quit
if (builderQuitEventHandler == null)
{
builderQuitEventHandler += value;
builderQuitEventCallbackDelegate = new QuitEventCallbackDelegate(OnQuit);
quitSignal = this.QuitSignal();
quitSignal?.Connect(builderQuitEventCallbackDelegate);
builderQuitEventCallbackDelegate = OnQuit;
Interop.Builder.QuitConnect(SwigCPtr, builderQuitEventCallbackDelegate.ToHandleRef(this));
NDalicPINVOKE.ThrowExceptionIfExists();
}
else
{
Expand All @@ -68,7 +67,8 @@ public event DaliEventHandler<object, QuitEventArgs> Quit
builderQuitEventHandler -= value;
if (builderQuitEventHandler == null)
{
quitSignal?.Disconnect(builderQuitEventCallbackDelegate);
Interop.Builder.QuitDisconnect(SwigCPtr, builderQuitEventCallbackDelegate.ToHandleRef(this));
NDalicPINVOKE.ThrowExceptionIfExists();
builderQuitEventCallbackDelegate = null;
}
}
Expand Down Expand Up @@ -281,13 +281,6 @@ internal LinearConstrainer GetLinearConstrainer(string linearConstrainerName)
return ret;
}

internal VoidSignal QuitSignal()
{
VoidSignal ret = new VoidSignal(Interop.Builder.QuitSignal(SwigCPtr), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

public enum UIFormat
{
JSON
Expand Down
Loading

0 comments on commit 2c1a96f

Please sign in to comment.