wieslawsoltes
/
SkiaSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Change obsolete property (Context.MainWindow -> NativeParent)

This commit is contained in:
Hobum (Vincent) Kwon 2018-04-04 18:48:50 +09:00
Родитель 585aaaee08
Коммит 67fbfb5003
7 изменённых файлов: 120 добавлений и 124 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

102
samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj Executable file → Normal file
Просмотреть файл

@ -1,51 +1,51 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Property Group for Tizen40 Project -->
<PropertyGroup>
<TargetFramework>tizen40</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>portable</DebugType>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>None</DebugType>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Folder Include="res\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SkiaSharpSample\SkiaSharpSample.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj">
</ProjectReference>
</ItemGroup>
<!-- Include Nuget Package for Tizen Project building -->
<ItemGroup>
<None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\linux-x86\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Tizen.NET" Version="4.0.0">
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.77107" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<!-- Property Group for Tizen40 Project -->
<PropertyGroup>
<TargetFramework>tizen40</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>portable</DebugType>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>None</DebugType>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Folder Include="res\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SkiaSharpSample\SkiaSharpSample.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj">
</ProjectReference>
</ItemGroup>
<!-- Include Nuget Package for Tizen Project building -->
<ItemGroup>
<None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\linux-x86\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Tizen.NET" Version="4.0.0">
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.280555"/>
</ItemGroup>
</Project>

124
samples/Gallery/Xamarin.Forms/Tizen/SkiaSharpGallery.Tizen.csproj Executable file → Normal file
Просмотреть файл

@ -1,62 +1,62 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Property Group for Tizen40 Project -->
<PropertyGroup>
<TargetFramework>tizen40</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>portable</DebugType>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>None</DebugType>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Folder Include="res\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj"/>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj" />
</ItemGroup>
<!-- Include Nuget Package for Tizen Project building -->
<ItemGroup>
<None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\linux-x86\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\i386\libHarfBuzzSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libHarfBuzzSharp.so')">
<Link>tpkroot\bin\runtimes\linux-x86\native\libHarfBuzzSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\armel\libHarfBuzzSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libHarfBuzzSharp.so')">
<Link>tpkroot\bin\runtimes\tizen-armel\native\libHarfBuzzSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Tizen.NET" Version="4.0.0">
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.77107" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<!-- Property Group for Tizen40 Project -->
<PropertyGroup>
<TargetFramework>tizen40</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>portable</DebugType>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>None</DebugType>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Folder Include="res\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj"/>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj" />
</ItemGroup>
<!-- Include Nuget Package for Tizen Project building -->
<ItemGroup>
<None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\linux-x86\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libSkiaSharp.so')">
<Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\i386\libHarfBuzzSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libHarfBuzzSharp.so')">
<Link>tpkroot\bin\runtimes\linux-x86\native\libHarfBuzzSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\..\..\output\native\tizen\armel\libHarfBuzzSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libHarfBuzzSharp.so')">
<Link>tpkroot\bin\runtimes\tizen-armel\native\libHarfBuzzSharp.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Tizen.NET" Version="4.0.0">
<ExcludeAssets>Runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.280555" />
</ItemGroup>
</Project>

4
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs
Просмотреть файл

@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
using SKFormsView = SkiaSharp.Views.Forms.SKCanvasView;
@ -130,7 +130,7 @@ namespace SkiaSharp.Views.Forms
#elif TIZEN4_0
protected virtual TNativeView CreateNativeControl()
{
TNativeView ret = (TNativeView)Activator.CreateInstance(typeof(TNativeView), new[] { TForms.Context.MainWindow });
TNativeView ret = (TNativeView)Activator.CreateInstance(typeof(TNativeView), new[] { TForms.NativeParent });
return ret;
}
#else

4
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs
Просмотреть файл

@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
using Xamarin.Forms;
@ -136,7 +136,7 @@ namespace SkiaSharp.Views.Forms
#elif TIZEN4_0
protected virtual TNativeView CreateNativeControl()
{
TNativeView ret = (TNativeView)Activator.CreateInstance(typeof(TNativeView), new[] { TForms.Context.MainWindow });
TNativeView ret = (TNativeView)Activator.CreateInstance(typeof(TNativeView), new[] { TForms.NativeParent });
return ret;
}
#else

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj
Просмотреть файл

@ -20,7 +20,7 @@
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.77107" />
<PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.280555" />
<PackageReference Include="Tizen.NET" Version="4.0.0" />
<PackageReference Include="mdoc" Version="5.6.0" PrivateAssets="All" />
</ItemGroup>

2
source/SkiaSharp.Views/SkiaSharp.Views.Tizen/CustomRenderingView.cs
Просмотреть файл

@ -170,7 +170,6 @@ namespace SkiaSharp.Views.Tizen
/// <returns>Pointer to the newly created control.</returns>
protected sealed override IntPtr CreateHandle(EvasObject parent)
{
Console.WriteLine("SEC-CustomRenderingView.CreateHandle parent:" + parent);
IntPtr handle = Interop.Elementary.elm_layout_add(parent);
Interop.Elementary.elm_layout_theme_set(handle, "layout", "background", "default");
@ -182,7 +181,6 @@ namespace SkiaSharp.Views.Tizen
Interop.Elementary.elm_object_part_content_set(handle, "elm.swallow.content", EvasImage);
CreateNativeResources(parent);
Console.WriteLine("SEC-CustomRenderingView.CreateHandle handle:" + handle);
return handle;
}

6
source/SkiaSharp.Views/SkiaSharp.Views.Tizen/ScalingInfo.cs Executable file → Normal file
Просмотреть файл

@ -1,4 +1,4 @@
using ElmSharp;
using ElmSharp;
using System;
using TSystemInfo = Tizen.System.SystemInfo;
@ -16,8 +16,7 @@ namespace SkiaSharp.Views.Tizen
/// DPI of the screen.
/// </summary>
private static Lazy<int> s_dpi = new Lazy<int>(() =>
{
Console.WriteLine("SEC--ScalingInfo Profile : " + Profile);
{
if (Profile == "tv")
{
// TV has fixed DPI value (72)
@ -26,7 +25,6 @@ namespace SkiaSharp.Views.Tizen
int dpi = 0;
TSystemInfo.TryGetValue("http://tizen.org/feature/screen.dpi", out dpi);
Console.WriteLine("SEC--ScalingInfo DPI : " + dpi);
return dpi;
});