Fix build error (#60)

myroot · Aug 25, 2022 · 8d0ad8d · 8d0ad8d
1 parent ace4a0f
commit 8d0ad8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Core/src/Animations/NativeTicker.Tizen.cs b/src/Core/src/Animations/NativeTicker.Tizen.cs
@@ -19,7 +19,7 @@ public NativeTicker()
 			}
 
 			_context = SynchronizationContext.Current;
-			_timer = new Timer((object o) => HandleElapsed(o), this, Timeout.Infinite, Timeout.Infinite);
+			_timer = new Timer((object? o) => HandleElapsed(o), this, Timeout.Infinite, Timeout.Infinite);
 		}
 
 		public override void Start()
@@ -34,7 +34,7 @@ public override void Stop()
 			_isRunning = false;
 		}
 
-		void HandleElapsed(object state)
+		void HandleElapsed(object? state)
 		{
 			_context?.Post((o) => Fire?.Invoke(), null);
 		}

diff --git a/src/Core/src/Platform/Tizen/WrapperView.cs b/src/Core/src/Platform/Tizen/WrapperView.cs
@@ -149,7 +149,11 @@ void OnClipPaint(object? sender, DrawClipEventArgs e)
 			}
 		}
 
+<<<<<<< HEAD
 		void OnLayout(object? sender, LayoutEventArgs e)
+=======
+		void OnLayout(object? sender, Tizen.UIExtensions.Common.LayoutEventArgs e)
+>>>>>>> 69d66e477 (Fix build error (#60))
 		{
 			if (Content != null)
 			{