diff options
| author | Kangho Hur <kangho.hur@samsung.com> | 2016-11-07 11:56:37 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@s001> | 2016-11-07 11:56:37 +0900 |
| commit | f9a8a0350762e5d6ae1c32a8713c2559a03d4b14 (patch) | |
| tree | 003e58ddc95cdfb48280c8fc869c6770b729af4f | |
| parent | ec5ec142b178e4dfbd8f21bfb194b6641ddd421a (diff) | |
| parent | bf112290ea840a004022930a590a0cd24cd58319 (diff) | |
| download | elm-sharp-f9a8a0350762e5d6ae1c32a8713c2559a03d4b14.tar.gz elm-sharp-f9a8a0350762e5d6ae1c32a8713c2559a03d4b14.tar.bz2 elm-sharp-f9a8a0350762e5d6ae1c32a8713c2559a03d4b14.zip | |
Merge "Add ThemeOverlay() API in Elementary." into devel/dotnet
| -rw-r--r-- | ElmSharp.Test/TestRunner.cs | 1 | ||||
| -rw-r--r-- | ElmSharp/ElmSharp/Elementary.cs | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ElmSharp.Test/TestRunner.cs b/ElmSharp.Test/TestRunner.cs index a306469..9bee255 100644 --- a/ElmSharp.Test/TestRunner.cs +++ b/ElmSharp.Test/TestRunner.cs @@ -48,6 +48,7 @@ namespace ElmSharp.Test ResourceDir = Path.Combine(Path.GetDirectoryName(typeof(TestRunner).GetTypeInfo().Assembly.Location), "res"); Elementary.Initialize(); + Elementary.ThemeOverlay(); EcoreSynchronizationContext.Initialize(); diff --git a/ElmSharp/ElmSharp/Elementary.cs b/ElmSharp/ElmSharp/Elementary.cs index 051a91f..42ba886 100644 --- a/ElmSharp/ElmSharp/Elementary.cs +++ b/ElmSharp/ElmSharp/Elementary.cs @@ -26,10 +26,6 @@ namespace ElmSharp public static void Initialize() { Interop.Elementary.elm_init(0, null); - if (File.Exists(_themeFilePath)) - { - Interop.Elementary.elm_theme_overlay_add(IntPtr.Zero, _themeFilePath); - } } public static void Shutdown() @@ -42,6 +38,14 @@ namespace ElmSharp Interop.Elementary.elm_run(); } + public static void ThemeOverlay() + { + if (File.Exists(_themeFilePath)) + { + Interop.Elementary.elm_theme_overlay_add(IntPtr.Zero, _themeFilePath); + } + } + public static double GetSystemScrollFriction() { return Interop.Elementary.elm_config_scroll_bring_in_scroll_friction_get(); |