Skip to content

Commit 8035b6b

Browse files
authored
Merge pull request #78 from ylatuya/format
Apply style format and check it in the CI
2 parents 4420959 + 64b436d commit 8035b6b

File tree

405 files changed

+13578
-15683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

405 files changed

+13578
-15683
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ jobs:
1616
- name: Setup dotnet
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 5.0.x
20-
- name: Install dotnet-format tool
21-
run: dotnet tool install -g dotnet-format
22-
# - name: Check format
23-
# run: sh scripts/format-csharp --check
19+
dotnet-version: 7.0.x
20+
- name: Check format
21+
if: matrix.config.os == 'ubuntu-latest'
22+
run: dotnet format Source/gtk-sharp.sln --verify-no-changes --no-restore
2423
- name: Install Deps
2524
run: pip3 install meson ninja
2625
- name: Configure

Source/.editorconfig

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Remove the line below if you want to inherit .editorconfig settings from higher directories
22
root = true
33

4+
[**/generated/*.cs]
5+
generated_code = true
6+
47
# C# files
5-
[**/custom/*.cs]
8+
[*.cs]
69

710
#### Core EditorConfig Options ####
811

@@ -114,13 +117,13 @@ csharp_using_directive_placement = outside_namespace:silent
114117
#### C# Formatting Rules ####
115118

116119
# New line preferences
117-
csharp_new_line_before_catch = true
118-
csharp_new_line_before_else = true
119-
csharp_new_line_before_finally = true
120-
csharp_new_line_before_members_in_anonymous_types = true
121-
csharp_new_line_before_members_in_object_initializers = true
120+
csharp_new_line_before_catch = false
121+
csharp_new_line_before_else = false
122+
csharp_new_line_before_finally = false
123+
csharp_new_line_before_members_in_anonymous_types = false
124+
csharp_new_line_before_members_in_object_initializers = false
122125
csharp_new_line_before_open_brace = none
123-
csharp_new_line_between_query_expression_clauses = true
126+
csharp_new_line_between_query_expression_clauses = false
124127

125128
# Indentation preferences
126129
csharp_indent_block_contents = true

Source/atk/Global.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ namespace Atk {
2828

2929
public partial class Global {
3030

31-
[DllImport ("atk-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
32-
static extern uint atk_add_global_event_listener (GLib.Signal.EmissionHookNative hook, IntPtr event_type);
33-
34-
public static uint AddGlobalEventListener (GLib.Signal.EmissionHook hook, string event_type)
35-
{
36-
IntPtr native_event_type = GLib.Marshaller.StringToPtrGStrdup (event_type);
37-
uint id = atk_add_global_event_listener (new GLib.Signal.EmissionHookMarshaler (hook).Callback, native_event_type);
38-
GLib.Marshaller.Free (native_event_type);
31+
[DllImport("atk-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
32+
static extern uint atk_add_global_event_listener(GLib.Signal.EmissionHookNative hook, IntPtr event_type);
33+
34+
public static uint AddGlobalEventListener(GLib.Signal.EmissionHook hook, string event_type) {
35+
IntPtr native_event_type = GLib.Marshaller.StringToPtrGStrdup(event_type);
36+
uint id = atk_add_global_event_listener(new GLib.Signal.EmissionHookMarshaler(hook).Callback, native_event_type);
37+
GLib.Marshaller.Free(native_event_type);
3938
return id;
4039
}
4140
}
42-
}
41+
}

Source/atk/Hyperlink.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
namespace Atk {
2525
public partial class Hyperlink {
2626

27-
protected void EmitLinkActivated ()
28-
{
29-
GLib.Signal.Emit (this, "link_activated");
27+
protected void EmitLinkActivated() {
28+
GLib.Signal.Emit(this, "link_activated");
3029
}
3130
}
32-
}
31+
}

Source/atk/Misc.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ namespace Atk {
2929
public partial class Misc {
3030

3131
[DllImport("atksharpglue-3")]
32-
static extern void atksharp_misc_set_singleton_instance (IntPtr misc);
33-
34-
public static void SetSingletonInstance (Misc misc)
35-
{
36-
atksharp_misc_set_singleton_instance (misc.Handle);
32+
static extern void atksharp_misc_set_singleton_instance(IntPtr misc);
33+
34+
public static void SetSingletonInstance(Misc misc) {
35+
atksharp_misc_set_singleton_instance(misc.Handle);
3736
}
3837
}
39-
}
38+
}

Source/atk/Object.cs

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,27 @@ namespace Atk {
2525

2626
public partial class Object {
2727

28-
protected void EmitChildrenChanged (ChildrenChangedDetail detail, uint child_index, Atk.Object child)
29-
{
30-
GLib.Signal.Emit (this,
31-
"children-changed::" + detail.ToString ().ToLower (),
28+
protected void EmitChildrenChanged(ChildrenChangedDetail detail, uint child_index, Atk.Object child) {
29+
GLib.Signal.Emit(this,
30+
"children-changed::" + detail.ToString().ToLower(),
3231
child_index, child.Handle);
3332
}
34-
35-
protected enum ChildrenChangedDetail
36-
{
33+
34+
protected enum ChildrenChangedDetail {
3735
Add,
3836
Remove
3937
}
4038

41-
protected void EmitVisibleDataChanged ()
42-
{
43-
GLib.Signal.Emit (this, "visible-data-changed");
39+
protected void EmitVisibleDataChanged() {
40+
GLib.Signal.Emit(this, "visible-data-changed");
4441
}
45-
46-
public void NotifyStateChange (Atk.StateType state, bool value) {
47-
NotifyStateChange ((ulong)state, value);
42+
43+
public void NotifyStateChange(Atk.StateType state, bool value) {
44+
NotifyStateChange((ulong)state, value);
4845
}
4946

50-
protected void EmitFocusEvent (bool gained)
51-
{
52-
GLib.Signal.Emit (this, "focus-event", gained);
47+
protected void EmitFocusEvent(bool gained) {
48+
GLib.Signal.Emit(this, "focus-event", gained);
5349
}
5450
}
55-
}
51+
}

Source/atk/SelectionAdapter.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
namespace Atk {
2525
public partial class SelectionAdapter {
2626

27-
public void EmitSelectionChanged ()
28-
{
29-
GLib.Signal.Emit (GLib.Object.GetObject (Handle), "selection_changed");
27+
public void EmitSelectionChanged() {
28+
GLib.Signal.Emit(GLib.Object.GetObject(Handle), "selection_changed");
3029
}
3130
}
32-
}
31+
}

Source/atk/TextAdapter.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424
namespace Atk {
2525
public partial class TextAdapter {
2626

27-
public void EmitTextChanged (TextChangedDetail detail, int position, int length)
28-
{
29-
GLib.Signal.Emit (GLib.Object.GetObject (Handle),
30-
"text_changed::" + detail.ToString ().ToLower (),
31-
position, length);
27+
public void EmitTextChanged(TextChangedDetail detail, int position, int length) {
28+
GLib.Signal.Emit(GLib.Object.GetObject(Handle),
29+
"text_changed::" + detail.ToString().ToLower(),
30+
position, length);
3231
}
3332
}
34-
}
33+
}

Source/atk/TextChangedDetail.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ public enum TextChangedDetail {
2323
Insert,
2424
Delete
2525
}
26-
}
26+
}

Source/atk/Util.cs

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,86 +28,83 @@ namespace Atk {
2828

2929
public partial class Util {
3030

31-
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
32-
delegate uint AddGlobalEventListenerNativeDelegate (GLib.Signal.EmissionHookNative hook, IntPtr event_type);
33-
31+
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
32+
delegate uint AddGlobalEventListenerNativeDelegate(GLib.Signal.EmissionHookNative hook, IntPtr event_type);
33+
3434
static AddGlobalEventListenerDelegate add_global_event_listener_handler;
3535
static AddGlobalEventListenerNativeDelegate add_global_event_listener_callback;
3636

37-
static uint AddGlobalEventListenerCallback (GLib.Signal.EmissionHookNative hook, IntPtr event_type)
38-
{
37+
static uint AddGlobalEventListenerCallback(GLib.Signal.EmissionHookNative hook, IntPtr event_type) {
3938
try {
40-
return add_global_event_listener_handler (new GLib.Signal.EmissionHookMarshaler (hook, IntPtr.Zero).Invoker, GLib.Marshaller.Utf8PtrToString (event_type));
39+
return add_global_event_listener_handler(new GLib.Signal.EmissionHookMarshaler(hook, IntPtr.Zero).Invoker, GLib.Marshaller.Utf8PtrToString(event_type));
4140
} catch (Exception e) {
42-
GLib.ExceptionManager.RaiseUnhandledException (e, false);
41+
GLib.ExceptionManager.RaiseUnhandledException(e, false);
4342
}
4443
return 0;
4544
}
4645

47-
public delegate uint AddGlobalEventListenerDelegate (GLib.Signal.EmissionHook hook, string event_type);
46+
public delegate uint AddGlobalEventListenerDelegate(GLib.Signal.EmissionHook hook, string event_type);
4847

4948
[DllImport("atksharpglue-3")]
50-
static extern void atksharp_util_override_add_global_event_listener (AddGlobalEventListenerNativeDelegate cb);
49+
static extern void atksharp_util_override_add_global_event_listener(AddGlobalEventListenerNativeDelegate cb);
5150
public static AddGlobalEventListenerDelegate AddGlobalEventListenerHandler {
5251
set {
5352
add_global_event_listener_handler = value;
5453
if (add_global_event_listener_callback == null)
55-
add_global_event_listener_callback = new AddGlobalEventListenerNativeDelegate (AddGlobalEventListenerCallback);
56-
atksharp_util_override_add_global_event_listener (add_global_event_listener_callback);
54+
add_global_event_listener_callback = new AddGlobalEventListenerNativeDelegate(AddGlobalEventListenerCallback);
55+
atksharp_util_override_add_global_event_listener(add_global_event_listener_callback);
5756
}
5857
}
5958

60-
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
61-
delegate void RemoveListenerNativeDelegate (uint listener_id);
59+
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
60+
delegate void RemoveListenerNativeDelegate(uint listener_id);
6261

6362
static RemoveListenerDelegate remove_global_event_listener_handler;
6463
static RemoveListenerNativeDelegate remove_global_event_listener_callback;
6564

66-
static void RemoveGlobalEventListenerCallback (uint listener_id)
67-
{
65+
static void RemoveGlobalEventListenerCallback(uint listener_id) {
6866
try {
69-
remove_global_event_listener_handler (listener_id);
67+
remove_global_event_listener_handler(listener_id);
7068
} catch (Exception e) {
71-
GLib.ExceptionManager.RaiseUnhandledException (e, false);
69+
GLib.ExceptionManager.RaiseUnhandledException(e, false);
7270
}
7371
}
7472

7573
[DllImport("atksharpglue-3")]
76-
static extern void atksharp_util_override_remove_global_event_listener (RemoveListenerNativeDelegate cb);
77-
78-
public delegate void RemoveListenerDelegate (uint listener_id);
74+
static extern void atksharp_util_override_remove_global_event_listener(RemoveListenerNativeDelegate cb);
75+
76+
public delegate void RemoveListenerDelegate(uint listener_id);
7977

8078
public static RemoveListenerDelegate RemoveGlobalEventListenerHandler {
8179
set {
8280
remove_global_event_listener_handler = value;
8381
if (remove_global_event_listener_callback == null)
84-
remove_global_event_listener_callback = new RemoveListenerNativeDelegate (RemoveGlobalEventListenerCallback);
85-
atksharp_util_override_remove_global_event_listener (remove_global_event_listener_callback);
82+
remove_global_event_listener_callback = new RemoveListenerNativeDelegate(RemoveGlobalEventListenerCallback);
83+
atksharp_util_override_remove_global_event_listener(remove_global_event_listener_callback);
8684
}
8785
}
8886

8987
static RemoveListenerDelegate remove_key_event_listener_handler;
9088
static RemoveListenerNativeDelegate remove_key_event_listener_callback;
9189

92-
static void RemoveKeyEventListenerCallback (uint listener_id)
93-
{
90+
static void RemoveKeyEventListenerCallback(uint listener_id) {
9491
try {
95-
remove_key_event_listener_handler (listener_id);
92+
remove_key_event_listener_handler(listener_id);
9693
} catch (Exception e) {
97-
GLib.ExceptionManager.RaiseUnhandledException (e, false);
94+
GLib.ExceptionManager.RaiseUnhandledException(e, false);
9895
}
9996
}
10097

10198
[DllImport("atksharpglue-3")]
102-
static extern void atksharp_util_override_remove_key_event_listener (RemoveListenerNativeDelegate cb);
103-
99+
static extern void atksharp_util_override_remove_key_event_listener(RemoveListenerNativeDelegate cb);
100+
104101
public static RemoveListenerDelegate RemoveKeyEventListenerHandler {
105102
set {
106103
remove_key_event_listener_handler = value;
107104
if (remove_key_event_listener_callback == null)
108-
remove_key_event_listener_callback = new RemoveListenerNativeDelegate (RemoveKeyEventListenerCallback);
109-
atksharp_util_override_remove_key_event_listener (remove_key_event_listener_callback);
105+
remove_key_event_listener_callback = new RemoveListenerNativeDelegate(RemoveKeyEventListenerCallback);
106+
atksharp_util_override_remove_key_event_listener(remove_key_event_listener_callback);
110107
}
111108
}
112109
}
113-
}
110+
}

0 commit comments

Comments
 (0)