summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec2
-rw-r--r--Xamarin.Forms.Platform.Tizen/Forms.cs12
-rw-r--r--Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs11
-rw-r--r--Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec2
4 files changed, 14 insertions, 13 deletions
diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec
index 23d0537f..555c1974 100644
--- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec
+++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec
@@ -11,7 +11,7 @@
<description>Xamarin.Forms.Maps Renderer for Tizen.Net</description>
<copyright>Copyright 2016</copyright>
<dependencies>
- <dependency id="Xamarin.Forms.Maps" version="2.3.3.0" />
+ <dependency id="Xamarin.Forms.Maps" version="2.3.5.233-pre1" />
</dependencies>
</metadata>
<files>
diff --git a/Xamarin.Forms.Platform.Tizen/Forms.cs b/Xamarin.Forms.Platform.Tizen/Forms.cs
index d9b73bf4..555b149e 100644
--- a/Xamarin.Forms.Platform.Tizen/Forms.cs
+++ b/Xamarin.Forms.Platform.Tizen/Forms.cs
@@ -15,6 +15,12 @@ namespace Xamarin.Forms.Platform.Tizen
static Lazy<int> s_dpi = new Lazy<int>(() =>
{
int dpi = 0;
+ var info = Device.Info as TizenDeviceInfo;
+ if (info != null && info.Profile == "tv")
+ {
+ // Use fixed DPI value (72) if TV profile
+ return 72;
+ }
TSystemInfo.TryGetValue<int>("http://tizen.org/feature/screen.dpi", out dpi);
return dpi;
});
@@ -69,6 +75,9 @@ namespace Xamarin.Forms.Platform.Tizen
public TizenDeviceInfo(FormsApplication formsApplication)
{
+ //TODO : Fix me if elm_config_profile_get() unavailable
+ profile = Elementary.GetProfile();
+
int width = 0;
int height = 0;
@@ -83,9 +92,6 @@ namespace Xamarin.Forms.Platform.Tizen
pixelScreenSize = new Size(width, height);
scaledScreenSize = new Size(width / scalingFactor, height / scalingFactor);
-
- //TODO : Fix me if elm_config_profile_get() unavailable
- profile = Elementary.GetProfile();
}
}
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs
index a0cca4ed..bc1a2cb7 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs
@@ -449,14 +449,9 @@ namespace Xamarin.Forms.Platform.Tizen
if (nre.Page == null)
throw new ArgumentNullException("page");
- Device.StartTimer(TimeSpan.FromMilliseconds(0), () =>
- {
- EvasObject page = Platform.GetOrCreateRenderer(nre.Page).NativeView;
- _naviFrame.InsertBefore(GetNaviItemForPage(nre.BeforePage), page, SpanTitle(nre.Page.Title));
-
- UpdateHasNavigationBar(nre.Page);
- return false;
- });
+ EvasObject page = Platform.GetOrCreateRenderer(nre.Page).NativeView;
+ _naviFrame.InsertBefore(GetNaviItemForPage(nre.BeforePage), page, SpanTitle(nre.Page.Title));
+ UpdateHasNavigationBar(nre.Page);
}
void AnimationFinishedHandler(object sender, EventArgs e)
diff --git a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec
index b9b952c1..7b5e79cb 100644
--- a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec
+++ b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec
@@ -12,7 +12,7 @@
<description>Xamarin Forms Renderer to build native UIs for Tizen.Net</description>
<copyright>Copyright 2016</copyright>
<dependencies>
- <dependency id="Xamarin.Forms" version="2.3.4.214-pre5" />
+ <dependency id="Xamarin.Forms" version="2.3.5.233-pre1" />
</dependencies>
</metadata>
<files>