chore: build errors

unoplatform · Aug 8, 2024 · 1991bd3 · 1991bd3
1 parent 7a79d0c
commit 1991bd3
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 24 deletions.
diff --git a/doc/articles/controls/GLCanvasElement.md b/doc/articles/controls/GLCanvasElement.md
@@ -77,8 +77,10 @@ XAML:
              d:DesignHeight="300"
              d:DesignWidth="400">
 
-    <skia:GLTriangleElement />
-    <not_skia:TextBlock Text="This sample is only supported on skia." />
+    <Grid>
+        <skia:GLTriangleElement />
+        <not_skia:TextBlock Text="This sample is only supported on skia." />
+    </Grid>
 </UserControl>
 ```
 

diff --git a/doc/articles/controls/SKCanvasElement.md b/doc/articles/controls/SKCanvasElement.md
@@ -47,15 +47,17 @@ XAML:
              d:DesignHeight="300"
              d:DesignWidth="400">
 
-    <skia:Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Slider Grid.Row="0" x:Name="slider" Header="Sample" Minimum="0" Maximum="{x:Bind MaxSampleIndex}" />
-        <local:SKCanvasElementImpl Grid.Row="1" Sample="{x:Bind slider.Value, Mode=OneWay}" />
-    </skia:Grid>
-    <not_skia:TextBlock Text="This sample is only supported on skia." />
+    <Grid>
+        <skia:Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Slider Grid.Row="0" x:Name="slider" Header="Sample" Minimum="0" Maximum="{x:Bind MaxSampleIndex}" />
+            <local:SKCanvasElementImpl Grid.Row="1" Sample="{x:Bind slider.Value, Mode=OneWay}" />
+        </skia:Grid>
+        <not_skia:TextBlock Text="This sample is only supported on skia." />
+    </Grid>
 </UserControl>
 ```
 

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Composition/GLCanvasElement_Cube.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Composition/GLCanvasElement_Cube.xaml
@@ -10,6 +10,8 @@
              d:DesignHeight="300"
              d:DesignWidth="400">
 
-	<skia:RotatingCubeGlCanvasElement />
-	<not_skia:TextBlock Text="This sample is only supported on skia." />
+	<Grid>
+		<skia:RotatingCubeGlCanvasElement />
+		<not_skia:TextBlock Text="This sample is only supported on skia." />
+	</Grid>
 </UserControl>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Composition/GLCanvasElement_Simple.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Composition/GLCanvasElement_Simple.xaml
@@ -10,6 +10,8 @@
              d:DesignHeight="300"
              d:DesignWidth="400">
 
-	<skia:SimpleTriangleGlCanvasElement />
-	<not_skia:TextBlock Text="This sample is only supported on skia." />
+	<Grid>
+		<skia:SimpleTriangleGlCanvasElement />
+		<not_skia:TextBlock Text="This sample is only supported on skia." />
+	</Grid>
 </UserControl>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Composition/RotatingCubeGlCanvasElement.skia.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Composition/RotatingCubeGlCanvasElement.skia.cs
@@ -11,6 +11,7 @@
 
 // https://github.com/dotnet/Silk.NET/tree/c27224cce6b8136224c01d40de2d608879d709b5/examples/CSharp/OpenGL%20Tutorials
 
+#if __SKIA__
 using System;
 using System.Diagnostics;
 using System.Numerics;
@@ -284,3 +285,4 @@ public unsafe void VertexAttributePointer(uint index, int count, VertexAttribPoi
 		}
 	}
 }
+#endif
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Composition/SKCanvasElementImpl.skia.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Composition/SKCanvasElementImpl.skia.cs
@@ -1,3 +1,4 @@
+#if __SKIA__
 using System;
 using Windows.Foundation;
 using Microsoft.UI.Xaml;
@@ -132,3 +133,4 @@ SKPath Star()
 		}
 	}
 }
+#endif
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Composition/SKCanvasElement_Simple.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Composition/SKCanvasElement_Simple.xaml
@@ -10,13 +10,15 @@
              d:DesignHeight="300"
              d:DesignWidth="400">
 
-	<skia:Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<Slider Grid.Row="0" x:Name="slider" Header="Sample" Minimum="0" Maximum="{x:Bind MaxSampleIndex}" />
-		<local:SKCanvasElementImpl Grid.Row="1" Sample="{x:Bind slider.Value, Mode=OneWay}" />
-	</skia:Grid>
-	<not_skia:TextBlock Text="This sample is only supported on skia." />
+	<Grid>
+		<skia:Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="*" />
+			</Grid.RowDefinitions>
+			<Slider Grid.Row="0" x:Name="slider" Header="Sample" Minimum="0" Maximum="{x:Bind MaxSampleIndex}" />
+			<local:SKCanvasElementImpl Grid.Row="1" Sample="{x:Bind slider.Value, Mode=OneWay}" />
+		</skia:Grid>
+		<not_skia:TextBlock Text="This sample is only supported on skia." />
+	</Grid>
 </UserControl>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Composition/SimpleTriangleGlCanvasElement.skia.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Composition/SimpleTriangleGlCanvasElement.skia.cs
@@ -1,3 +1,4 @@
+#if __SKIA__
 using System;
 using System.Drawing;
 using Microsoft.UI.Xaml.Controls;
@@ -105,3 +106,4 @@ protected override void RenderOverride(GL gl)
 		}
 	}
 }
+#endif