using ElmSharp;
using System.Collections.Generic;
-using EColor = ElmSharp.Color;
namespace Xamarin.Forms.Platform.Tizen
{
return null;
}
- protected int FindCellContentHeight(Cell cell)
+ protected double FindCellContentHeight(Cell cell)
{
ViewCell viewCell = cell as ViewCell;
if (viewCell != null)
{
var parentWidth = (cell.Parent as VisualElement).Width;
var view = viewCell.View;
- return (int)view.Measure(parentWidth, double.PositiveInfinity).Request.Height;
+ return view.Measure(parentWidth, double.PositiveInfinity).Request.Height;
}
else
return -1;
{
public class EntryCellRenderer : ViewCellRenderer
{
- static readonly int s_defaultHeight = 120;
+ static readonly double s_defaultHeight = 65;
static readonly EColor s_defaultLabelColor = EColor.Black;
readonly Dictionary<EvasObject, VisualElement> _cacheCandidate = new Dictionary<EvasObject, VisualElement>();
if (part == MainContentPart)
{
var entryCell = cell as EntryCell;
- int height = (int)entryCell.RenderHeight;
- height = height > 0 ? height : s_defaultHeight;
+ int pixelHeight = Forms.ConvertToScaledPixel(entryCell.RenderHeight);
+ pixelHeight = pixelHeight > 0 ? pixelHeight : Forms.ConvertToPixel(s_defaultHeight);
var label = new Label()
{
};
layout.Parent = cell.Parent;
layout.BindingContext = entryCell;
- layout.MinimumHeightRequest = height;
+ layout.MinimumHeightRequest = Forms.ConvertToScaledDP(pixelHeight);
var nativeView = Platform.GetOrCreateRenderer(layout).NativeView;
- nativeView.MinimumHeight = height;
+ nativeView.MinimumHeight = pixelHeight;
_cacheCandidate[nativeView] = layout;
nativeView.Deleted += (sender, e) =>
{
var layout = _cacheCandidate[old];
layout.BindingContext = cell;
- int height = (int)cell.RenderHeight;
- height = height > 0 ? height : s_defaultHeight;
+ int height = Forms.ConvertToScaledPixel(cell.RenderHeight);
+ height = height > 0 ? height : Forms.ConvertToPixel(s_defaultHeight);
old.MinimumHeight = height;
return old;
}
{
public class ImageCellRenderer : TextCellRenderer
{
- const int _defaultHeight = 100;
+ const int _defaultHeight = 55;
Dictionary<EvasObject, Native.Image> _realizedViews = new Dictionary<EvasObject, Native.Image>();
public ImageCellRenderer() : this("type1")
if (part == ImagePart)
{
var imgCell = cell as ImageCell;
- var size = imgCell.RenderHeight;
- if (size <= 0)
+ int pixelSize = Forms.ConvertToScaledPixel(imgCell.RenderHeight);
+ if (pixelSize <= 0)
{
- size = _defaultHeight;
+ pixelSize = Forms.ConvertToPixel(_defaultHeight);
}
var image = new Native.Image(Forms.Context.MainWindow)
{
- MinimumWidth = (int)size,
- MinimumHeight = (int)size
+ MinimumWidth = pixelSize,
+ MinimumHeight = pixelSize
};
image.SetAlignment(-1.0, -1.0); // fill
image.SetWeight(1.0, 1.0); // expand
Platform.GetRenderer(viewCell.View)?.Dispose();
var renderer = Platform.GetOrCreateRenderer(viewCell.View);
- int height = (int)viewCell.RenderHeight;
+ double height = viewCell.RenderHeight;
height = height > 0 ? height : FindCellContentHeight(viewCell);
- renderer.NativeView.MinimumHeight = height;
+ renderer.NativeView.MinimumHeight = Forms.ConvertToScaledPixel(height);
return renderer.NativeView;
}
return null;
duplicatedCell.Parent = listView;
var renderer = Platform.GetOrCreateRenderer(duplicatedCell.View);
- int height = (int)duplicatedCell.RenderHeight;
+ double height = duplicatedCell.RenderHeight;
height = height > 0 ? height : FindCellContentHeight(duplicatedCell);
- renderer.NativeView.MinimumHeight = height;
+ renderer.NativeView.MinimumHeight = Forms.ConvertToScaledPixel(height);
_cacheCandidate[renderer.NativeView] = duplicatedCell;
renderer.NativeView.Deleted += (sender, e) =>
--- /dev/null
+using ERect = ElmSharp.Rect;
+using ESize = ElmSharp.Size;
+
+namespace Xamarin.Forms.Platform.Tizen
+{
+ /// <summary>
+ /// Extension class, provides DIP convert functionalities
+ /// </summary>
+ public static class DensityIndependentPixelExtensions
+ {
+ public static Rectangle ToDP(this ERect rect)
+ {
+ return new Rectangle(Forms.ConvertToScaledDP(rect.X), Forms.ConvertToScaledDP(rect.Y), Forms.ConvertToScaledDP(rect.Width), Forms.ConvertToScaledDP(rect.Height));
+ }
+
+ public static ERect ToPixel(this Rectangle rect)
+ {
+ return new ERect(Forms.ConvertToScaledPixel(rect.X), Forms.ConvertToScaledPixel(rect.Y), Forms.ConvertToScaledPixel(rect.Width), Forms.ConvertToScaledPixel(rect.Height));
+ }
+
+ public static Size ToDP(this ESize size)
+ {
+ return new Size(Forms.ConvertToScaledDP(size.Width), Forms.ConvertToScaledDP(size.Height));
+ }
+
+ public static ESize ToPixel(this Size size)
+ {
+ return new ESize(Forms.ConvertToScaledPixel(size.Width), Forms.ConvertToScaledPixel(size.Height));
+ }
+ }
+}
TSystemInfo.TryGetValue<int>("http://tizen.org/feature/screen.dpi", out dpi);
return dpi;
});
+
+ static Lazy<double> s_elmScale = new Lazy<double>(() =>
+ {
+ // 72.0 is from EFL which is using fixed DPI value (72.0) to determine font size internally. Thus, we are restoring the size by deviding the DPI by 72.0 here.
+ return s_dpi.Value / 72.0 / Elementary.GetScale();
+ });
+
class TizenDeviceInfo : DeviceInfo
{
readonly Size pixelScreenSize;
TSystemInfo.TryGetValue("http://tizen.org/feature/screen.height", out height);
scalingFactor = 1.0; // scaling is disabled, we're using pixels as Xamarin's geometry units
+ if (_useDeviceIndependentPixel)
+ {
+ scalingFactor = s_dpi.Value / 160.0;
+ }
+
pixelScreenSize = new Size(width, height);
scaledScreenSize = new Size(width / scalingFactor, height / scalingFactor);
}
}
+ static bool _useDeviceIndependentPixel = false;
+
public static event EventHandler<ViewInitializedEventArgs> ViewInitialized;
public static FormsApplication Context
public static void Init(FormsApplication application)
{
+ Init(application, false);
+ }
+
+ public static void Init(FormsApplication application, bool useDeviceIndependentPixel)
+ {
+ _useDeviceIndependentPixel = useDeviceIndependentPixel;
SetupInit(application);
}
{
Device.Idiom = TargetIdiom.TV;
}
- else if ( profile == "desktop")
+ else if (profile == "desktop")
{
Device.Idiom = TargetIdiom.Desktop;
}
return Color.Black;
}
+ /// <summary>
+ /// Converts the dp into pixel considering current DPI value.
+ /// </summary>
+ /// <remarks>
+ /// Use this API if you want to get pixel size without scaling factor.
+ /// </remarks>
+ /// <param name="dp"></param>
+ /// <returns></returns>
internal static int ConvertToPixel(double dp)
{
return (int)Math.Round(dp * s_dpi.Value / 160.0);
}
+
+ /// <summary>
+ /// Converts the dp into pixel by using scaling factor.
+ /// </summary>
+ /// <remarks>
+ /// Use this API if you want to get pixel size from dp by using scaling factor.
+ /// If the scaling factor is 1.0 by user setting, the same value is returned. This is mean that user doesn't want to pixel independent metric.
+ /// </remarks>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ internal static int ConvertToScaledPixel(double dp)
+ {
+ return (int)Math.Round(dp * Device.Info.ScalingFactor);
+ }
+
+ /// <summary>
+ /// Converts the pixel into dp value by using scaling factor.
+ /// </summary>
+ /// <remarks>
+ /// If the scaling factor is 1.0 by user setting, the same value is returned. This is mean that user doesn't want to pixel independent metric.
+ /// </remarks>
+ /// <param name="pixel"></param>
+ /// <returns></returns>
+ internal static double ConvertToScaledDP(int pixel)
+ {
+ return pixel / Device.Info.ScalingFactor;
+ }
+
+ /// <summary>
+ /// Converts the pixel into dp value by using scaling factor.
+ /// </summary>
+ /// <remarks>
+ /// If the scaling factor is 1.0 by user setting, the same value is returned. This is mean that user doesn't want to pixel independent metric.
+ /// </remarks>
+ /// <param name="pixel"></param>
+ /// <returns></returns>
+ internal static double ConvertToScaledDP(double pixel)
+ {
+ return pixel / Device.Info.ScalingFactor;
+ }
+
+ /// <summary>
+ /// Converts the sp into EFL's font size metric (EFL point).
+ /// </summary>
+ /// <param name="sp"></param>
+ /// <returns></returns>
+ internal static int ConvertToEflFontPoint(double sp)
+ {
+ return (int)Math.Round(sp * s_elmScale.Value);
+ }
+
+ /// <summary>
+ /// Convert the EFL's point into sp.
+ /// </summary>
+ /// <param name="eflPt"></param>
+ /// <returns></returns>
+ internal static double ConvertToDPFont(int eflPt)
+ {
+ return eflPt / s_elmScale.Value;
+ }
}
class TizenExpressionSearch : ExpressionVisitor, IExpressionSearch
if (element.MinimumHeightRequest == -1)
{
SizeRequest request = element.Measure(double.PositiveInfinity, double.PositiveInfinity);
- renderer.NativeView.MinimumHeight = (int)request.Request.Height;
+ renderer.NativeView.MinimumHeight = Forms.ConvertToScaledPixel(request.Request.Height);
}
else
{
- renderer.NativeView.MinimumHeight = (int)element.MinimumHeightRequest;
+ renderer.NativeView.MinimumHeight = Forms.ConvertToScaledPixel(element.MinimumHeightRequest);
}
return renderer.NativeView;
if (FontSize != -1)
{
- _formattingString.AppendFormat("font_size={0} ", Forms.ConvertToPixel(FontSize));
+ _formattingString.AppendFormat("font_size={0} ", Forms.ConvertToEflFontPoint(FontSize));
}
if ((FontAttributes & FontAttributes.Bold) != 0)
using System;
using EColor = ElmSharp.Color;
+using ESize = ElmSharp.Size;
using Specific = Xamarin.Forms.PlatformConfiguration.TizenSpecific.VisualElement;
namespace Xamarin.Forms.Platform.Tizen
protected override Size MinimumSize()
{
- return new Size(Control.MinimumWidth, Control.MinimumHeight);
+ return new ESize(Control.MinimumWidth, Control.MinimumHeight).ToDP();
}
void ButtonClickedHandler(object sender, EventArgs e)
if (scrollView != null)
{
Size size = scrollView.ContentSize;
- Control.MinimumWidth = ToNativeDimension(Math.Max(size.Width, scrollView.Content.Width));
- Control.MinimumHeight = ToNativeDimension(Math.Max(size.Height, scrollView.Content.Height));
+ Control.MinimumWidth = Forms.ConvertToScaledPixel(Math.Max(size.Width, scrollView.Content.Width));
+ Control.MinimumHeight = Forms.ConvertToScaledPixel(Math.Max(size.Height, scrollView.Content.Height));
}
base.UpdateLayout();
y = itemPosition.Y;
}
- Rect region = new Rect(ToNativeDimension(x), ToNativeDimension(y), ToNativeDimension(Element.Width), ToNativeDimension(Element.Height));
+ Rect region = new Rectangle(x, y, Element.Width, Element.Height).ToPixel();
Control.ScrollTo(region, e.ShouldAnimate);
}
}
protected override Size MinimumSize()
{
- return new Size(250, 120);
+ return new Size(136, 65);
}
/// <summary>
using ERectangle = ElmSharp.Rectangle;
using Specific = Xamarin.Forms.PlatformConfiguration.TizenSpecific.VisualElement;
-
namespace Xamarin.Forms.Platform.Tizen
{
/// <summary>
}
else
{
- int availableWidth = ToNativeDimension(widthConstraint);
- int availableHeight = ToNativeDimension(heightConstraint);
- ESize measured;
+ int availableWidth = Forms.ConvertToScaledPixel(widthConstraint);
+ int availableHeight = Forms.ConvertToScaledPixel(heightConstraint);
+
+ if (availableWidth < 0)
+ availableWidth = int.MaxValue;
+ if (availableHeight < 0)
+ availableHeight = int.MaxValue;
+ Size measured;
var nativeViewMeasurable = NativeView as Native.IMeasurable;
if (nativeViewMeasurable != null)
{
- measured = nativeViewMeasurable.Measure(availableWidth, availableHeight);
+ measured = nativeViewMeasurable.Measure(availableWidth, availableHeight).ToDP();
}
else
{
- measured = Measure(availableWidth, availableHeight);
+ measured = Measure(availableWidth, availableHeight).ToDP();
}
- return new SizeRequest(new Size(measured.Width, measured.Height), MinimumSize());
+ return new SizeRequest(measured, MinimumSize());
}
}
{
var x = ComputeAbsoluteX(Element);
var y = ComputeAbsoluteY(Element);
- NativeView.Geometry = new ERect(ToNativeDimension(x), ToNativeDimension(y), ToNativeDimension(Element.Width), ToNativeDimension(Element.Height));
+ NativeView.Geometry = new Rectangle(x, y, Element.Width, Element.Height).ToPixel();
ApplyTransformation();
UpdateOpacityLayer();
}
protected void DoLayout(Native.LayoutEventArgs e)
{
Settings.StartIgnoringBatchCommitted();
- Element.Layout(new Rectangle(Element.X, Element.Y, e.Width, e.Height));
+
+ Element.Layout(new Rectangle(Element.X, Element.Y, Forms.ConvertToScaledDP(e.Width), Forms.ConvertToScaledDP(e.Height)));
if (e.HasChanged)
{
UpdateLayout();
}
}
- /// <summary>
- /// Converts provided value to native dimension.
- /// </summary>
- /// <param name="v">value to be converted.</param>
- /// <returns>converted value</returns>
- protected static int ToNativeDimension(double v)
- {
- return (int)Math.Round(v);
- }
-
static double ComputeAbsoluteX(VisualElement e)
{
- return e.X + (e.RealParent is VisualElement ? Platform.GetRenderer(e.RealParent).NativeView.Geometry.X : 0.0);
+ return e.X + (e.RealParent is VisualElement ? Forms.ConvertToScaledDP(Platform.GetRenderer(e.RealParent).NativeView.Geometry.X) : 0.0);
}
static double ComputeAbsoluteY(VisualElement e)
{
- return e.Y + (e.RealParent is VisualElement ? Platform.GetRenderer(e.RealParent).NativeView.Geometry.Y : 0.0);
+ return e.Y + (e.RealParent is VisualElement ? Forms.ConvertToScaledDP(Platform.GetRenderer(e.RealParent).NativeView.Geometry.Y) : 0.0);
}
/// <summary>
void ApplyTranslation(EvasMap map, ERect geometry, ref bool changed)
{
- var shiftX = ToNativeDimension(Element.TranslationX);
- var shiftY = ToNativeDimension(Element.TranslationY);
+ var shiftX = Forms.ConvertToScaledPixel(Element.TranslationX);
+ var shiftY = Forms.ConvertToScaledPixel(Element.TranslationY);
// apply translation, i.e. move/shift the object a little
if (shiftX != 0 || shiftY != 0)
public double GetNamedSize(NamedSize size, Type targetElementType, bool useOldSizes)
{
- double baseSize = 10;
- double baseSizeSpan = 2;
+ double baseSize = Forms.ConvertToDPFont(19);
+ double baseSizeSpan = 3;
// In case of TV profile The base named size sholud be lager than mobile profile
- if (Device.Idiom == TargetIdiom.TV)
+ if (Device.Idiom != TargetIdiom.Phone)
{
// TODO: These valuse should be updated when TV profile UX guideline released.
- baseSize = 60;
- baseSizeSpan = 5;
+ baseSize = 50;
+ baseSizeSpan = 12;
}
switch (size)
<Compile Include="Extensions\PlatformConfigurationExtensions.cs" />
<Compile Include="Extensions\ColorExtensions.cs" />
<Compile Include="Extensions\KeyboardExtensions.cs" />
+ <Compile Include="Extensions\DensityIndependentPixelExtensions.cs" />
<Compile Include="Extensions\LayoutExtensions.cs" />
<Compile Include="Extensions\NativeBindingExtensions.cs" />
<Compile Include="Extensions\ScrollToPositionExtensions.cs" />
%define XF_VERSION 2.3.4
# Increase this XF_TIZEN_VERSION when any public APIs of Xamarin.Forms.Platform.Tizen are changed.
-%define XF_TIZEN_VERSION r192-001
+%define XF_TIZEN_VERSION r192-002
Name: xamarin-forms-tizen
Summary: Xamarin.Forms for Tizen platform
projects / platform / upstream / xamarin-forms.git / commitdiff