Merge pull request #4 from nventive/dev/jela/wasm-linking

Update uno, banner
mono · Jun 27, 2019 · be5bae5 · be5bae5
2 parents b292551 + 503c994
commit be5bae5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/samples/Gallery/UWP/SkiaSharpSample/MainPage.xaml b/samples/Gallery/UWP/SkiaSharpSample/MainPage.xaml
@@ -30,10 +30,8 @@
         AppName="SkiaSharp Samples (Experimental)"
         AppAuthor="Microsoft">
         <banner:BannerControl.AboutContent>
-            This application uses CanvasKit for WebAssembly (Skia) and Skia# for .NET, running on WebAssembly with software rendering. It
-            is an experiment for the integration of Skia in an application running on top of  Mono for WebAssembly. 
-            It uses a temporary interfacing mechanism until Emscripten and Mono improve the support for dynamic
-            linking of WebAssembly modules.
+            This application uses CanvasKit for WebAssembly (Skia) and Skia# for .NET, running on WebAssembly with software rendering.
+            It uses a dynamic and static linking and .NET P/Invoke mechanism to package and use Skia# from C#.
         </banner:BannerControl.AboutContent>
 
         <Grid Background="Gray">
@@ -43,7 +41,7 @@
             </Grid.RowDefinitions>
             <Grid Grid.Row="1">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="{ThemeResource SplitViewCompactPaneThemeLength}" />
+                    <RowDefinition Height="auto" />
                     <RowDefinition />
                 </Grid.RowDefinitions>
                 <SplitView Name="splitView" DisplayMode="Inline" IsPaneOpen="true" OpenPaneLength="320" Grid.Row="1">

diff --git a/samples/Gallery/UWP/SkiaSharpSample/MainPage.xaml.cs b/samples/Gallery/UWP/SkiaSharpSample/MainPage.xaml.cs
@@ -100,9 +100,11 @@ private void Initialize()
 			{
 				listView.Height = double.NaN;
 			});
+
+			commandBar.Visibility = Visibility.Collapsed;
 #endif
 
-			}
+		}
 
 		protected override void OnNavigatedFrom(NavigationEventArgs e)
 		{

diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1163" />
+    <PackageReference Include="Uno.UI" Version="1.46.0-dev.1991" />
     <PackageReference Include="Microsoft.TypeScript.Compiler" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/source/SkiaSharpSample/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/source/SkiaSharpSample/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
@@ -52,8 +52,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1852" />
-    <PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.14" />
+    <PackageReference Include="Uno.UI" Version="1.46.0-dev.1991" />
+    <PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.23" />
     <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.298" />
     <DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.298" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,9 +100,11 @@ private void Initialize() @@
     			{
     				listView.Height = double.NaN;
     			});
+    			commandBar.Visibility = Visibility.Collapsed;
     #endif
-    			}
+    		}
     		protected override void OnNavigatedFrom(NavigationEventArgs e)
     		{
@@ Expand Down @@