summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ElmSharp.Test/TC/PerformanceTest.cs2
-rwxr-xr-xElmSharp/ElmSharp/EcoreAnimator.cs2
-rwxr-xr-x[-rw-r--r--]ElmSharp/ElmSharp/EvasObject.cs9
-rwxr-xr-x[-rw-r--r--]ElmSharp/ElmSharp/Layout.cs9
-rwxr-xr-x[-rw-r--r--]ElmSharp/ElmSharp/Widget.cs5
-rwxr-xr-x[-rw-r--r--]ElmSharp/Interop/Interop.Evas.cs3
6 files changed, 27 insertions, 3 deletions
diff --git a/ElmSharp.Test/TC/PerformanceTest.cs b/ElmSharp.Test/TC/PerformanceTest.cs
index 2640b33..b5bb77e 100644
--- a/ElmSharp.Test/TC/PerformanceTest.cs
+++ b/ElmSharp.Test/TC/PerformanceTest.cs
@@ -179,7 +179,7 @@ namespace ElmSharp.Test
private void List_ScrollAnimationStarted(object sender, EventArgs e)
{
_ecoreCount = 0;
- _anim = EcoreAnimator.AddAmimator(OnEcoreCheck);
+ _anim = EcoreAnimator.AddAnimator(OnEcoreCheck);
list.RenderPost += List_RenderPostFrame;
}
diff --git a/ElmSharp/ElmSharp/EcoreAnimator.cs b/ElmSharp/ElmSharp/EcoreAnimator.cs
index a6b7992..64a548d 100755
--- a/ElmSharp/ElmSharp/EcoreAnimator.cs
+++ b/ElmSharp/ElmSharp/EcoreAnimator.cs
@@ -49,7 +49,7 @@ namespace ElmSharp
/// </summary>
/// <param name="handler">The function to call when it ticks off</param>
/// <returns>A handle to the new animator</returns>
- public static IntPtr AddAmimator(Func<bool> handler)
+ public static IntPtr AddAnimator(Func<bool> handler)
{
int id = RegistHandler(handler);
return Interop.Ecore.ecore_animator_add(_nativeHandler, (IntPtr)id);
diff --git a/ElmSharp/ElmSharp/EvasObject.cs b/ElmSharp/ElmSharp/EvasObject.cs
index 598789a..4693486 100644..100755
--- a/ElmSharp/ElmSharp/EvasObject.cs
+++ b/ElmSharp/ElmSharp/EvasObject.cs
@@ -750,6 +750,15 @@ namespace ElmSharp
}
/// <summary>
+ /// Call the calculate smart function immediately.
+ /// This will force immediate calculations needed for renderization of this object.
+ /// </summary>
+ public void Calculate()
+ {
+ Interop.Evas.evas_object_smart_calculate(RealHandle);
+ }
+
+ /// <summary>
/// Sets the hints for an object's aspect ratio.
/// </summary>
/// <param name="aspect">The policy or type of aspect ratio to apply to object</param>
diff --git a/ElmSharp/ElmSharp/Layout.cs b/ElmSharp/ElmSharp/Layout.cs
index 217a0a3..3de5e8e 100644..100755
--- a/ElmSharp/ElmSharp/Layout.cs
+++ b/ElmSharp/ElmSharp/Layout.cs
@@ -251,7 +251,7 @@ namespace ElmSharp
/// <summary>
/// Sets the layout content.
/// </summary>
- /// <param name="swallow">The swallow part name in the edje file</param>
+ /// <param name="part">The swallow part name in the edje file</param>
/// <param name="content">The child that will be added in this layout object.</param>
/// <returns>TRUE on success, FALSE otherwise</returns>
public override bool SetPartContent(string part, EvasObject content)
@@ -259,6 +259,13 @@ namespace ElmSharp
return SetPartContent(part, content, false);
}
+ /// <summary>
+ /// Sets the layout content.
+ /// </summary>
+ /// <param name="part">The name of particular part</param>
+ /// <param name="content">The content</param>
+ /// <param name="preserveOldContent">true, preserve old content will be unset. false, preserve old content will not be unset.</param>
+ /// <returns>TRUE on success, FALSE otherwise</returns>
public override bool SetPartContent(string part, EvasObject content, bool preserveOldContent)
{
if (preserveOldContent)
diff --git a/ElmSharp/ElmSharp/Widget.cs b/ElmSharp/ElmSharp/Widget.cs
index d18e047..f1df744 100644..100755
--- a/ElmSharp/ElmSharp/Widget.cs
+++ b/ElmSharp/ElmSharp/Widget.cs
@@ -87,6 +87,11 @@ namespace ElmSharp
_unfocused.On += (s, e) => Unfocused?.Invoke(this, EventArgs.Empty);
}
+ /// <summary>
+ /// Update the part contents
+ /// </summary>
+ /// <param name="content">The content which put to the part</param>
+ /// <param name="part">The updated part</param>
protected void UpdatePartContents(EvasObject content, string part = "__default__")
{
_partContents[part] = content;
diff --git a/ElmSharp/Interop/Interop.Evas.cs b/ElmSharp/Interop/Interop.Evas.cs
index ce76066..f37ae6f 100644..100755
--- a/ElmSharp/Interop/Interop.Evas.cs
+++ b/ElmSharp/Interop/Interop.Evas.cs
@@ -442,6 +442,9 @@ internal static partial class Interop
internal static extern void evas_object_smart_changed(IntPtr obj);
[DllImport(Libraries.Evas)]
+ internal static extern void evas_object_smart_calculate(IntPtr obj);
+
+ [DllImport(Libraries.Evas)]
internal static extern void evas_color_argb_premul(int a, ref int r, ref int g, ref int b);
[DllImport(Libraries.Evas)]