Update the samples to use the new namespaces

This commit is contained in:
Matthew Leibowitz 2016-10-19 04:18:07 +02:00
Родитель 8476c9258c
Коммит 59b5c70eb0
10 изменённых файлов: 17 добавлений и 17 удалений

Просмотреть файл

@ -1,7 +1,7 @@
using System;
using AppKit;
using SkiaSharp;
using SkiaSharp.Views;
using SkiaSharp.Views.Mac;
namespace SkiaSharpSample.MacSample
{

Просмотреть файл

@ -13,10 +13,10 @@ namespace SkiaSharpSample.MacSample
partial class MainViewController
{
[Outlet]
SkiaSharp.Views.SKCanvasView canvas { get; set; }
SkiaSharp.Views.Mac.SKCanvasView canvas { get; set; }
[Outlet]
SkiaSharp.Views.SKGLView glview { get; set; }
SkiaSharp.Views.Mac.SKGLView glview { get; set; }
void ReleaseDesignerOutlets ()
{

Просмотреть файл

@ -3,9 +3,9 @@ using System.ComponentModel;
using System.Linq;
using CoreGraphics;
using Foundation;
using SkiaSharp;
using SkiaSharp.Views;
using UIKit;
using SkiaSharp;
using SkiaSharp.Views.Mac;
namespace SkiaSharpSample.TvSample
{

2
samples/TvSample/TvSample/ViewController.designer.cs сгенерированный
Просмотреть файл

@ -16,7 +16,7 @@ namespace SkiaSharpSample.TvSample
{
[Outlet]
[GeneratedCode ("iOS Designer", "1.0")]
SkiaSharp.Views.SKCanvasView canvas { get; set; }
SkiaSharp.Views.Mac.SKCanvasView canvas { get; set; }
[Outlet]
[GeneratedCode ("iOS Designer", "1.0")]

Просмотреть файл

@ -1,6 +1,6 @@
<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:views="using:SkiaSharp.Views"
xmlns:views="using:SkiaSharp.Views.UWP"
xmlns:sample="using:SkiaSharpSample"
xmlns:local="using:SkiaSharpSample.UWPSample"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

Просмотреть файл

@ -15,7 +15,7 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Navigation;
using SkiaSharp;
using SkiaSharp.Views;
using SkiaSharp.Views.UWP;
namespace SkiaSharpSample.UWPSample
{

Просмотреть файл

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:views="clr-namespace:SkiaSharp.Views;assembly=SkiaSharp.Views.WPF"
xmlns:views="clr-namespace:SkiaSharp.Views.WPF;assembly=SkiaSharp.Views.WPF"
xmlns:local="clr-namespace:SkiaSharpSample.WPFSample"
mc:Ignorable="d"
Title="SkiaSharp for WPF" Height="350" Width="525">

Просмотреть файл

@ -11,7 +11,7 @@ using System.Windows.Forms.Integration;
using System.Windows.Input;
using System.Windows.Threading;
using SkiaSharp;
using SkiaSharp.Views;
using SkiaSharp.Views.WPF;
namespace SkiaSharpSample.WPFSample
{

12
samples/WindowsSample/WindowsSample/Form1.Designer.cs сгенерированный
Просмотреть файл

@ -29,8 +29,8 @@
private void InitializeComponent()
{
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.glview = new SkiaSharp.Views.SKGLControl();
this.canvas = new SkiaSharp.Views.SKControl();
this.glview = new SkiaSharp.Views.Desktop.SKGLControl();
this.canvas = new SkiaSharp.Views.Desktop.SKControl();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -80,7 +80,7 @@
this.glview.TabIndex = 1;
this.glview.Visible = false;
this.glview.VSync = false;
this.glview.PaintSurface += new System.EventHandler<SkiaSharp.Views.SKPaintGLSurfaceEventArgs>(this.OnPaintGL);
this.glview.PaintSurface += new System.EventHandler<SkiaSharp.Views.Desktop.SKPaintGLSurfaceEventArgs>(this.OnPaintGL);
this.glview.Click += new System.EventHandler(this.OnSampleClicked);
//
// canvas
@ -91,7 +91,7 @@
this.canvas.Name = "canvas";
this.canvas.Size = new System.Drawing.Size(774, 489);
this.canvas.TabIndex = 0;
this.canvas.PaintSurface += new System.EventHandler<SkiaSharp.Views.SKPaintSurfaceEventArgs>(this.OnPaintCanvas);
this.canvas.PaintSurface += new System.EventHandler<SkiaSharp.Views.Desktop.SKPaintSurfaceEventArgs>(this.OnPaintCanvas);
this.canvas.Click += new System.EventHandler(this.OnSampleClicked);
//
// menuStrip1
@ -222,8 +222,8 @@
private System.Windows.Forms.ToolStripMenuItem memoryToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem openGLToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem vulkanToolStripMenuItem;
private SkiaSharp.Views.SKControl canvas;
private SkiaSharp.Views.SKGLControl glview;
private SkiaSharp.Views.Desktop.SKControl canvas;
private SkiaSharp.Views.Desktop.SKGLControl glview;
}
}

Просмотреть файл

@ -8,7 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using SkiaSharp;
using SkiaSharp.Views;
using SkiaSharp.Views.Desktop;
namespace SkiaSharpSample.WindowsSample
{