();
- });
+
return result;
}
- private static TabItem TextTab()
+ private static TabItem HtmlTab()
{
return new TabItem
{
Header = "Text",
- Content = new StackPanel
- {
- Orientation = Orientation.Vertical,
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- Gap = 8,
- Width = 120,
- Children = new Controls
- {
- new TextBlock
- {
- Text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin venenatis dui quis libero suscipit tincidunt.",
- TextWrapping = TextWrapping.Wrap,
- TextAlignment = TextAlignment.Center,
- },
- new TextBlock
- {
- Text = "Italic text.",
- FontStyle = FontStyle.Italic,
- TextAlignment = TextAlignment.Left,
- },
- new TextBlock
- {
- Text = "Bold text.",
- FontWeight = FontWeight.Bold,
- TextAlignment = TextAlignment.Right,
- },
- new TextBox
- {
- Text = "A non-wrapping text box. Lorem ipsum dolor sit amet.",
- TextWrapping = TextWrapping.NoWrap,
- },
- new TextBox
- {
- AcceptsReturn = true,
- Text = "A wrapping text box. " +
- "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin venenatis dui quis libero suscipit tincidunt. " +
- "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin venenatis dui quis libero suscipit tincidunt.",
- TextWrapping = TextWrapping.Wrap,
- MaxHeight = 100,
- },
- }
- },
+ Content = new ScrollViewer()
+ {
+ CanScrollHorizontally = false,
+ Content = new StackPanel()
+ {
+ Margin = new Thickness(10),
+ Orientation = Orientation.Vertical,
+ Gap = 4,
+ Children = new Controls
+ {
+ new TextBlock
+ {
+ Text = "TextBlock",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A control for displaying text.",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new TextBlock
+ {
+ Text = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",
+ FontSize = 11
+ },
+ new TextBlock
+ {
+ Text = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",
+ FontSize = 11,
+ FontWeight = FontWeight.Medium
+ },
+ new TextBlock
+ {
+ Text = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",
+ FontSize = 11,
+ FontWeight = FontWeight.Bold
+ },
+ new TextBlock
+ {
+ Text = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",
+ FontSize = 11,
+ FontStyle = FontStyle.Italic,
+ },
+ new TextBlock
+ {
+ Margin = new Thickness(0, 40, 0, 0),
+ Text = "HtmlLabel",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A label capable of displaying HTML content",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new HtmlLabel
+ {
+ Background = SolidColorBrush.Parse("#CCCCCC"),
+ Padding = new Thickness(5),
+ Text = @"Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis.
+ Header Level 2
+
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ Aliquam tincidunt mauris eu risus.
+
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est.
Header Level 3
+
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ Aliquam tincidunt mauris eu risus.
+ "
+ }
+ }
+ }
+ }
};
}
- private static TabItem ImagesTab()
+ private static TabItem TextTab()
{
- ScrollBar size;
-
return new TabItem
{
- Header = "Images",
- Content = new StackPanel
- {
- Orientation = Orientation.Vertical,
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- Gap = 8,
- Children = new Controls
- {
- (size = new ScrollBar
- {
- Minimum = 100,
- Maximum = 400,
- Value = 100,
- Orientation = Orientation.Horizontal,
- }),
- new ScrollViewer
- {
- Width = 200,
- Height = 200,
- CanScrollHorizontally = true,
- Content = new Image
- {
- Source = new Bitmap("github_icon.png"),
- [!Image.WidthProperty] = size[!ScrollBar.ValueProperty],
- [!Image.HeightProperty] = size[!ScrollBar.ValueProperty],
- },
- },
- new ProgressBar
- {
- [!ProgressBar.MinimumProperty] = size[!ScrollBar.MinimumProperty],
- [!ProgressBar.MaximumProperty] = size[!ScrollBar.MaximumProperty],
- [!ProgressBar.ValueProperty] = size[!ScrollBar.ValueProperty],
- }
- }
- },
+ Header = "Input",
+ Content = new ScrollViewer()
+ {
+ Content = new StackPanel
+ {
+ Margin = new Thickness(10),
+ Orientation = Orientation.Vertical,
+ Gap = 4,
+ Children = new Controls
+ {
+ new TextBlock
+ {
+ Text = "TextBox",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A text box control",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new TextBox { Text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", Width = 200 },
+ new TextBox { AcceptsReturn = true, TextWrapping = TextWrapping.Wrap, Width = 200, Height = 150, Text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." },
+ new TextBlock
+ {
+ Margin = new Thickness(0, 40, 0, 0),
+ Text = "CheckBox",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A check box control",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new CheckBox { IsChecked = true, Margin = new Thickness(0, 0, 0, 5), Content = "Checked" },
+ new CheckBox { IsChecked = false, Content = "Unchecked" },
+ new TextBlock
+ {
+ Margin = new Thickness(0, 40, 0, 0),
+ Text = "RadioButton",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A radio button control",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new RadioButton { IsChecked = true, Content = "Option 1" },
+ new RadioButton { IsChecked = false, Content = "Option 2" },
+ new RadioButton { IsChecked = false, Content = "Option 3" },
+ }
+ }
+ }
};
}
+
private static TabItem ListsTab()
{
- ListBox listBox;
-
return new TabItem
{
Header = "Lists",
- Content = new StackPanel
- {
- DataTemplates = new DataTemplates
- {
- new DataTemplate- (x =>
- new StackPanel
- {
- Children = new Controls
- {
- new TextBlock { Text = x.Name, FontSize = 24 },
- new TextBlock { Text = x.Value },
- }
- })
- },
- Orientation = Orientation.Horizontal,
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- Gap = 8,
- Children = new Controls
- {
- new TreeView
- {
- Name = "treeView",
- Items = treeData,
- },
- (listBox = new ListBox
- {
- Items = listBoxData,
- MaxHeight = 300,
- }),
- new DropDown
- {
- Items = listBoxData,
- SelectedItem = listBoxData[0],
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
- },
+ Content = new ScrollViewer()
+ {
+ CanScrollHorizontally = false,
+ Content = new StackPanel
+ {
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Orientation = Orientation.Vertical,
+ VerticalAlignment = VerticalAlignment.Top,
+ Gap = 4,
+ Margin = new Thickness(10),
+ DataTemplates = new DataTemplates
+ {
+ new DataTemplate
- (x =>
+ new StackPanel
+ {
+ Gap = 4,
+ Orientation = Orientation.Horizontal,
+ Children = new Controls
+ {
+ new Image { Width = 50, Height = 50, Source = new Bitmap("github_icon.png") },
+ new TextBlock { Text = x.Name, FontSize = 18 }
+ }
+ })
+ },
+ Children = new Controls
+ {
+ new TextBlock
+ {
+ Text = "ListBox",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A list box control.",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new ListBox
+ {
+ BorderThickness = 2,
+ Items = s_listBoxData,
+ Height = 300,
+ Width = 300,
+ },
+ new TextBlock
+ {
+ Margin = new Thickness(0, 40, 0, 0),
+ Text = "TreeView",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A tree view control.",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new TreeView
+ {
+ Name = "treeView",
+ Items = s_treeData,
+ Height = 300,
+ BorderThickness = 2,
+ Width = 300,
+ }
+ }
+ },
+ }
};
}
+ private static TabItem ImagesTab()
+ {
+ var imageDeck = new Deck
+ {
+ Width = 400,
+ Height = 400,
+ Transition = new PageSlide(TimeSpan.FromSeconds(0.25)),
+ Items = new[]
+ {
+ new Image { Source = new Bitmap("github_icon.png"), Width = 400, Height = 400 },
+ new Image { Source = new Bitmap("pattern.jpg"), Width = 400, Height = 400 },
+ }
+ };
+
+ imageDeck.AutoSelect = true;
+
+ var next = new Button
+ {
+ VerticalAlignment = VerticalAlignment.Center,
+ Padding = new Thickness(20),
+ Content = new Perspex.Controls.Shapes.Path
+ {
+ Data = StreamGeometry.Parse("M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z"),
+ Fill = Brushes.Black
+ }
+ };
+
+ var prev = new Button
+ {
+ VerticalAlignment = VerticalAlignment.Center,
+ Padding = new Thickness(20),
+ Content = new Perspex.Controls.Shapes.Path
+ {
+ Data = StreamGeometry.Parse("M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"),
+ Fill = Brushes.Black
+ }
+ };
+
+ prev.Click += (s, e) =>
+ {
+ if (imageDeck.SelectedIndex == 0)
+ imageDeck.SelectedIndex = 1;
+ else
+ imageDeck.SelectedIndex--;
+ };
+
+ next.Click += (s, e) =>
+ {
+ if (imageDeck.SelectedIndex == 1)
+ imageDeck.SelectedIndex = 0;
+ else
+ imageDeck.SelectedIndex++;
+ };
+
+ return new TabItem
+ {
+ Header = "Images",
+ Content = new ScrollViewer
+ {
+ Content = new StackPanel
+ {
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Orientation = Orientation.Vertical,
+ VerticalAlignment = VerticalAlignment.Top,
+ Gap = 4,
+ Margin = new Thickness(10),
+ Children = new Controls
+ {
+ new TextBlock
+ {
+ Text = "Deck",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "An items control that displays its items as pages that fill the controls.",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new StackPanel
+ {
+ Name = "deckVisual",
+ Orientation = Orientation.Horizontal,
+ Gap = 4,
+ Children = new Controls
+ {
+ prev,
+ imageDeck,
+ next
+ }
+ }
+ }
+ }
+ }
+ };
+ }
+
private static TabItem LayoutTab()
{
return new TabItem
{
Header = "Layout",
- Content = new Grid
- {
- ColumnDefinitions = new ColumnDefinitions
- {
- new ColumnDefinition(1, GridUnitType.Star),
- new ColumnDefinition(1, GridUnitType.Star),
- },
- Margin = new Thickness(50),
- Children = new Controls
- {
- new StackPanel
- {
- Orientation = Orientation.Vertical,
- Gap = 8,
- Children = new Controls
+ Content = new ScrollViewer
+ {
+ Content = new StackPanel
+ {
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Orientation = Orientation.Vertical,
+ VerticalAlignment = VerticalAlignment.Top,
+ Gap = 4,
+ Margin = new Thickness(10),
+ Children = new Controls
+ {
+ new TextBlock
+ {
+ Text = "Grid",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "Lays out child controls according to a grid.",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new Grid
+ {
+ Width = 600,
+ ColumnDefinitions = new ColumnDefinitions
+ {
+ new ColumnDefinition(1, GridUnitType.Star),
+ new ColumnDefinition(1, GridUnitType.Star),
+ },
+
+ RowDefinitions = new RowDefinitions
+ {
+ new RowDefinition(1, GridUnitType.Auto),
+ new RowDefinition(1, GridUnitType.Auto)
+ },
+ Children = new Controls
+ {
+
+ new Rectangle
+ {
+ Fill = SolidColorBrush.Parse("#FF5722"),
+ [Grid.ColumnSpanProperty] = 2,
+ Height = 200,
+ Margin = new Thickness(2.5)
+ },
+ new Rectangle
+ {
+ Fill = SolidColorBrush.Parse("#FF5722"),
+ [Grid.RowProperty] = 1,
+ Height = 100,
+ Margin = new Thickness(2.5)
+ },
+ new Rectangle
+ {
+ Fill = SolidColorBrush.Parse("#FF5722"),
+ [Grid.RowProperty] = 1,
+ [Grid.ColumnProperty] = 1,
+ Height = 100,
+ Margin = new Thickness(2.5)
+ },
+ },
+ },
+ new TextBlock
+ {
+ Margin = new Thickness(0, 40, 0, 0),
+ Text = "StackPanel",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A panel which lays out its children horizontally or vertically.",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ new StackPanel
+ {
+ Orientation = Orientation.Vertical,
+ Gap = 4,
+ Width = 300,
+ Children = new Controls
+ {
+ new Rectangle
+ {
+ Fill = SolidColorBrush.Parse("#FFC107"),
+ Height = 50,
+ },
+ new Rectangle
+ {
+ Fill = SolidColorBrush.Parse("#FFC107"),
+ Height = 50,
+ },
+ new Rectangle
+ {
+ Fill = SolidColorBrush.Parse("#FFC107"),
+ Height = 50,
+ },
+ }
+ },
+ new TextBlock
{
- new Button { HorizontalAlignment = HorizontalAlignment.Left, Content = "Left Aligned" },
- new Button { HorizontalAlignment = HorizontalAlignment.Center, Content = "Center Aligned" },
- new Button { HorizontalAlignment = HorizontalAlignment.Right, Content = "Right Aligned" },
- new Button { HorizontalAlignment = HorizontalAlignment.Stretch, Content = "Stretch" },
+ Margin = new Thickness(0, 40, 0, 0),
+ Text = "Canvas",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
},
- [Grid.ColumnProperty] = 0,
- },
- new StackPanel
- {
- Orientation = Orientation.Horizontal,
- Gap = 8,
- Children = new Controls
+ new TextBlock
{
- new Button { VerticalAlignment = VerticalAlignment.Top, Content = "Top Aligned" },
- new Button { VerticalAlignment = VerticalAlignment.Center, Content = "Center Aligned" },
- new Button { VerticalAlignment = VerticalAlignment.Bottom, Content = "Bottom Aligned" },
- new Button { VerticalAlignment = VerticalAlignment.Stretch, Content = "Stretch" },
+ Text = "A panel which lays out its children by explicit coordinates.",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
},
- [Grid.ColumnProperty] = 1,
- },
- },
- }
+ new Canvas
+ {
+ Background = Brushes.Yellow,
+ Width = 300,
+ Height = 400,
+ Children = new Controls
+ {
+ new Rectangle
+ {
+ Fill = Brushes.Blue,
+ Width = 63,
+ Height = 41,
+ [Canvas.LeftProperty] = 40,
+ [Canvas.TopProperty] = 31,
+ },
+ new Ellipse
+ {
+ Fill = Brushes.Green,
+ Width = 58,
+ Height = 58,
+ [Canvas.LeftProperty] = 130,
+ [Canvas.TopProperty] = 79,
+ },
+ }
+ },
+ }
+ }
+ }
};
}
@@ -562,70 +731,88 @@ namespace TestApplication
var result = new TabItem
{
Header = "Animations",
- Content = new Grid
+ Content = new StackPanel
{
- ColumnDefinitions = new ColumnDefinitions
- {
- new ColumnDefinition(1, GridUnitType.Star),
- new ColumnDefinition(1, GridUnitType.Star),
- },
- RowDefinitions = new RowDefinitions
- {
- new RowDefinition(1, GridUnitType.Star),
- new RowDefinition(GridLength.Auto),
- },
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Orientation = Orientation.Vertical,
+ VerticalAlignment = VerticalAlignment.Top,
+ Gap = 4,
+ Margin = new Thickness(10),
Children = new Controls
{
- (border1 = new Border
- {
- Width = 100,
- Height = 100,
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- Background = Brushes.Crimson,
- RenderTransform = new RotateTransform(),
- Child = new TextBox
- {
- Background = Brushes.White,
- Text = "Hello!",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- },
- }),
- (border2 = new Border
- {
- Width = 100,
- Height = 100,
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- Background = Brushes.Coral,
- Child = new Image
- {
- Source = new Bitmap("github_icon.png"),
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- },
- RenderTransform = (rotate = new RotateTransform
- {
- PropertyTransitions = new PropertyTransitions
- {
- RotateTransform.AngleProperty.Transition(500),
- }
- }),
- PropertyTransitions = new PropertyTransitions
- {
- Rectangle.WidthProperty.Transition(300),
- Rectangle.HeightProperty.Transition(1000),
- },
- [Grid.ColumnProperty] = 1,
- }),
- (button1 = new Button
- {
- HorizontalAlignment = HorizontalAlignment.Center,
- Content = "Animate",
- [Grid.ColumnProperty] = 1,
- [Grid.RowProperty] = 1,
- }),
+ new TextBlock
+ {
+ Text = "Animations",
+ FontWeight = FontWeight.Medium,
+ FontSize = 20,
+ Foreground = SolidColorBrush.Parse("#212121"),
+ },
+ new TextBlock
+ {
+ Text = "A few animations showcased below",
+ FontSize = 13,
+ Foreground = SolidColorBrush.Parse("#727272"),
+ Margin = new Thickness(0, 0, 0, 10)
+ },
+ (button1 = new Button
+ {
+ Content = "Animate",
+ Width = 120,
+ [Grid.ColumnProperty] = 1,
+ [Grid.RowProperty] = 1,
+ }),
+ new Canvas
+ {
+ Children = new Controls
+ {
+ (border1 = new Border
+ {
+ Width = 100,
+ Height = 100,
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
+ Background = Brushes.Crimson,
+ RenderTransform = new RotateTransform(),
+ Child = new TextBox
+ {
+ Background = Brushes.White,
+ Text = "Hello!",
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
+ },
+ [Canvas.LeftProperty] = 100,
+ [Canvas.TopProperty] = 100,
+ }),
+ (border2 = new Border
+ {
+ Width = 100,
+ Height = 100,
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
+ Background = Brushes.Coral,
+ Child = new Image
+ {
+ Source = new Bitmap("github_icon.png"),
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
+ },
+ RenderTransform = (rotate = new RotateTransform
+ {
+ PropertyTransitions = new PropertyTransitions
+ {
+ RotateTransform.AngleProperty.Transition(500),
+ }
+ }),
+ PropertyTransitions = new PropertyTransitions
+ {
+ Layoutable.WidthProperty.Transition(300),
+ Layoutable.HeightProperty.Transition(1000),
+ },
+ [Canvas.LeftProperty] = 400,
+ [Canvas.TopProperty] = 100,
+ }),
+ }
+ }
},
},
};
diff --git a/samples/TestApplication/Properties/AssemblyInfo.cs b/samples/TestApplication/Properties/AssemblyInfo.cs
index 5e8029017d..4560d26d17 100644
--- a/samples/TestApplication/Properties/AssemblyInfo.cs
+++ b/samples/TestApplication/Properties/AssemblyInfo.cs
@@ -1,4 +1,7 @@
-using System.Reflection;
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -10,7 +13,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TestApplication")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyCopyright("Copyright \u00A9 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/samples/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj
index 1a3a6287fc..4ccecb2cd0 100644
--- a/samples/TestApplication/TestApplication.csproj
+++ b/samples/TestApplication/TestApplication.csproj
@@ -35,18 +35,6 @@
4
-
- ..\..\packages\Serilog.1.5.9\lib\net45\Serilog.dll
- True
-
-
- ..\..\packages\Serilog.1.5.9\lib\net45\Serilog.FullNetFx.dll
- True
-
-
- ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll
+
+ ..\..\packages\Serilog.1.5.9\lib\net45\Serilog.dll
+
+
+ ..\..\packages\Serilog.1.5.9\lib\net45\Serilog.FullNetFx.dll
+
+
+ ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
+
@@ -83,8 +83,12 @@
+
+ {FB05AC90-89BA-4F2F-A924-F37875FB547C}
+ Perspex.Cairo
+
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -103,6 +107,10 @@
{7062AE20-5DCC-4442-9645-8195BDECE63E}
Perspex.Diagnostics
+
+ {5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}
+ Perspex.HtmlRenderer
+
{62024B2D-53EB-4638-B26B-85EEAA54866E}
Perspex.Input
@@ -132,11 +140,11 @@
Perspex.Themes.Default
- {3e908f67-5543-4879-a1dc-08eace79b3cd}
+ {3E908F67-5543-4879-A1DC-08EACE79B3CD}
Perspex.Direct2D1
- {811a76cf-1cf6-440f-963b-bbe31bd72a82}
+ {811A76CF-1CF6-440F-963B-BBE31BD72A82}
Perspex.Win32
@@ -144,6 +152,10 @@
PreserveNewest
+
+ PreserveNewest
+
Intro
+
+
+
+
+ HTML Renderer Project - Perspex port
+ Beta support
+
+
+
+
+
+ Lightweight (~300K).
+ High performance and low memory footprint.
+ Extendable and configurable.
+
+
+ Limitations
+
+
+ All HTML end tags marked as
+ optional should be there. No problem with tags marked as forbidden.
+
+
+ On the roadmap
+ Of course it's not quite finished yet. Here are some of the important things to
+ do.
+
+ Better performance
+ Support of position CSS property
+ Support of height and min-height CSS property
+ Better tables support, especially layouts
+ Support image align
+ Handle :hover selector
+ Selection by shift+arrows
+ Better HTML tag parsing (optional closing tags)
+ More styles support
+
+
+ Vision
+
+
+ Most complete static HTML Renderer (no java script).
+ Commercial web browser performance level.
+
+
+ 2015 - Nikita Tsukanov (Perspex Port)
+
+
+
+ https://perspex.github.io/
+
+
+
+ 2012 - Arthur Teplitzki
+
+
+ http://TheArtOfDev.com
+
+
+ 2009 - Jose Manuel Menendez Poo
+
+
+ www.menendezpoo.com
+
+
+
+
\ No newline at end of file
diff --git a/samples/TestApplication/pattern.jpg b/samples/TestApplication/pattern.jpg
new file mode 100644
index 0000000000..72b35e0692
Binary files /dev/null and b/samples/TestApplication/pattern.jpg differ
diff --git a/samples/XamlTestApplication/App.config b/samples/XamlTestApplication/App.config
index bfc5697e01..5ce331f23a 100644
--- a/samples/XamlTestApplication/App.config
+++ b/samples/XamlTestApplication/App.config
@@ -1,7 +1,7 @@
-
diff --git a/samples/XamlTestApplication/App.cs b/samples/XamlTestApplication/App.cs
index 4762a4892e..d0c6f59040 100644
--- a/samples/XamlTestApplication/App.cs
+++ b/samples/XamlTestApplication/App.cs
@@ -1,16 +1,19 @@
-namespace XamlTestApplication
-{
- using System;
- using Perspex;
- using Perspex.Themes.Default;
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex;
+using Perspex.Themes.Default;
+namespace XamlTestApplication
+{
public class App : Application
{
public App()
{
- this.RegisterServices();
- this.InitializeSubsystems((int)Environment.OSVersion.Platform);
- this.Styles = new DefaultTheme();
+ RegisterServices();
+ InitializeSubsystems((int)Environment.OSVersion.Platform);
+ Styles = new DefaultTheme();
}
}
}
diff --git a/samples/XamlTestApplication/MainViewModel.cs b/samples/XamlTestApplication/MainViewModel.cs
index 57db4848c1..450c8f422f 100644
--- a/samples/XamlTestApplication/MainViewModel.cs
+++ b/samples/XamlTestApplication/MainViewModel.cs
@@ -1,15 +1,18 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Collections.Generic;
+using ReactiveUI;
+
namespace XamlTestApplication
{
- using System.Collections.Generic;
- using ReactiveUI;
-
public class MainViewModel : ReactiveObject
{
- private string name;
+ private string _name;
public MainViewModel()
{
- Name = "Jos Manuel";
+ Name = "Jos\u00E9 Manuel";
People = new List
{
new Person("a little bit of Monica in my life"),
@@ -24,8 +27,8 @@ namespace XamlTestApplication
public string Name
{
- get { return name; }
- set { this.RaiseAndSetIfChanged(ref name, value); }
+ get { return _name; }
+ set { this.RaiseAndSetIfChanged(ref _name, value); }
}
public List People { get; set; }
@@ -33,17 +36,17 @@ namespace XamlTestApplication
public class Person
{
- private string name;
+ private string _name;
public Person(string name)
{
- this.name = name;
+ _name = name;
}
public string Name
{
- get { return name; }
- set { name = value; }
+ get { return _name; }
+ set { _name = value; }
}
}
}
\ No newline at end of file
diff --git a/samples/XamlTestApplication/Program.cs b/samples/XamlTestApplication/Program.cs
index e24f228086..d115b67809 100644
--- a/samples/XamlTestApplication/Program.cs
+++ b/samples/XamlTestApplication/Program.cs
@@ -1,35 +1,38 @@
-namespace XamlTestApplication
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+using System.Windows.Threading;
+using Perspex;
+using Perspex.Collections;
+using Perspex.Controls;
+using Perspex.Controls.Templates;
+using ReactiveUI;
+using XamlTestApplication.Views;
+
+namespace XamlTestApplication
{
- using System;
- using System.Diagnostics;
- using System.Windows.Threading;
- using Perspex;
- using Perspex.Collections;
- using Perspex.Controls;
- using Perspex.Controls.Templates;
- using ReactiveUI;
- using Views;
-
- class Item
+ internal class Item
{
public string Name { get; set; }
public string Value { get; set; }
}
- class Node
+ internal class Node
{
public Node()
{
- this.Children = new PerspexList();
+ Children = new PerspexList();
}
public string Name { get; set; }
public PerspexList Children { get; set; }
}
- class Program
+ internal class Program
{
- static void Main()
+ private static void Main()
{
var foo = Dispatcher.CurrentDispatcher;
@@ -46,10 +49,10 @@
var testCommand = ReactiveCommand.Create();
testCommand.Subscribe(_ => Debug.WriteLine("Test command executed."));
-
+
var window = new MainWindow();
window.Show();
Application.Current.Run(window);
- }
+ }
}
}
diff --git a/samples/XamlTestApplication/Properties/AssemblyInfo.cs b/samples/XamlTestApplication/Properties/AssemblyInfo.cs
index 5e8029017d..4560d26d17 100644
--- a/samples/XamlTestApplication/Properties/AssemblyInfo.cs
+++ b/samples/XamlTestApplication/Properties/AssemblyInfo.cs
@@ -1,4 +1,7 @@
-using System.Reflection;
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -10,7 +13,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TestApplication")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyCopyright("Copyright \u00A9 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/samples/XamlTestApplication/Views/MainWindow.cs b/samples/XamlTestApplication/Views/MainWindow.cs
index 18760d9601..dc218641bf 100644
--- a/samples/XamlTestApplication/Views/MainWindow.cs
+++ b/samples/XamlTestApplication/Views/MainWindow.cs
@@ -1,20 +1,23 @@
-namespace XamlTestApplication.Views
-{
- using System;
- using System.Globalization;
- using System.IO;
- using System.Reflection;
- using System.Resources;
- using OmniXaml;
- using Perspex.Controls;
- using Perspex.Diagnostics;
- using Perspex.Markup.Xaml;
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Resources;
+using OmniXaml;
+using Perspex.Controls;
+using Perspex.Diagnostics;
+using Perspex.Markup.Xaml;
+namespace XamlTestApplication.Views
+{
public class MainWindow : Window
{
public MainWindow()
{
- this.InitializeComponent();
+ InitializeComponent();
DevTools.Attach(this);
}
diff --git a/samples/XamlTestApplication/Views/MainWindow.xaml b/samples/XamlTestApplication/Views/MainWindow.paml
similarity index 84%
rename from samples/XamlTestApplication/Views/MainWindow.xaml
rename to samples/XamlTestApplication/Views/MainWindow.paml
index 3294edb8b0..2c4525eb13 100644
--- a/samples/XamlTestApplication/Views/MainWindow.xaml
+++ b/samples/XamlTestApplication/Views/MainWindow.paml
@@ -1,19 +1,21 @@
-
-
-
+ Title="Perspex Test Application" Height="350" Width="525" SizeToContent="WidthAndHeight" >
+
+
+
+
+
-
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin venenatis dui quis libero suscipit tincidunt.
+
Bold text.
+
+
+
+
+
-
+
Debug
@@ -9,7 +9,7 @@
Properties
XamlTestApplication
XamlTestApplication
- v4.5.1
+ v4.5
512
@@ -36,59 +36,43 @@
4
-
- ..\..\packages\Glass.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll
- True
-
-
- ..\..\packages\OmniXaml.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll
+
+ ..\..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll
True
-
+
..\..\packages\Serilog.1.5.9\lib\net45\Serilog.dll
- True
-
+
..\..\packages\Serilog.1.5.9\lib\net45\Serilog.FullNetFx.dll
- True
-
+
..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
- ..\..\packages\Sprache.SuperJMN.2.0.0.50\lib\portable-net451+netcore451+wpa81\Sprache.dll
- True
+
+ ..\..\packages\Sprache.2.0.0.47\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid1+MonoTouch1\Sprache.dll
-
+
..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll
- True
-
+
..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll
- True
-
+
..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll
- True
-
+
..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll
- True
-
- ..\..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll
- True
-
-
-
- {415e048e-4611-4815-9cf2-d774e29079ac}
- NGenerics
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
- {799a7bb5-3c2c-48b6-85a7-406a12c420da}
+ {799A7BB5-3C2C-48B6-85A7-406A12C420DA}
Perspex.Application
- {b09b78d8-9b26-48b0-9149-d64a2f120f3f}
+ {B09B78D8-9B26-48B0-9149-D64A2F120F3F}
Perspex.Base
- {d2221c82-4a25-4583-9b43-d791e3f6820c}
+ {D2221C82-4A25-4583-9B43-D791E3F6820C}
Perspex.Controls
- {7062ae20-5dcc-4442-9645-8195bdece63e}
+ {7062AE20-5DCC-4442-9645-8195BDECE63E}
Perspex.Diagnostics
- {62024b2d-53eb-4638-b26b-85eeaa54866e}
+ {62024B2D-53EB-4638-B26B-85EEAA54866E}
Perspex.Input
- {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}
+ {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}
Perspex.Interactivity
- {42472427-4774-4c81-8aff-9f27b8e31721}
+ {42472427-4774-4C81-8AFF-9F27B8E31721}
Perspex.Layout
@@ -142,27 +122,27 @@
Perspex.ReactiveUI
- {eb582467-6abb-43a1-b052-e981ba910e3a}
+ {EB582467-6ABB-43A1-B052-E981BA910E3A}
Perspex.SceneGraph
- {f1baa01a-f176-4c6a-b39d-5b40bb1b148f}
+ {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}
Perspex.Styling
- {3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}
+ {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}
Perspex.Themes.Default
- {3e53a01a-b331-47f3-b828-4a5717e77a24}
+ {3E53A01A-B331-47F3-B828-4A5717E77A24}
Perspex.Markup.Xaml
- {3e908f67-5543-4879-a1dc-08eace79b3cd}
+ {3E908F67-5543-4879-A1DC-08EACE79B3CD}
Perspex.Direct2D1
- {811a76cf-1cf6-440f-963b-bbe31bd72a82}
+ {811A76CF-1CF6-440F-963B-BBE31BD72A82}
Perspex.Win32
@@ -173,9 +153,9 @@
+
Designer
-
+
-
\ No newline at end of file
diff --git a/src/Gtk/Perspex.Cairo/CairoExtensions.cs b/src/Gtk/Perspex.Cairo/CairoExtensions.cs
index dd09e7e46b..fa66837194 100644
--- a/src/Gtk/Perspex.Cairo/CairoExtensions.cs
+++ b/src/Gtk/Perspex.Cairo/CairoExtensions.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Cairo
{
@@ -10,6 +7,11 @@ namespace Perspex.Cairo
public static class CairoExtensions
{
+ public static Cairo.Color ToCairo(this Perspex.Media.Color color)
+ {
+ return new Cairo.Color(color.R / 255.0, color.G / 255.0, color.B / 255.0, color.A / 255.0);
+ }
+
public static Cairo.Matrix ToCairo(this Matrix m)
{
return new Cairo.Matrix(m.M11, m.M12, m.M21, m.M22, m.M31, m.M32);
@@ -25,6 +27,11 @@ namespace Perspex.Cairo
return new Cairo.Rectangle(rect.X, rect.Y, rect.Width, rect.Height);
}
+ public static Rect ToPerspex(this Cairo.Rectangle rect)
+ {
+ return new Rect(rect.X, rect.Y, rect.Width, rect.Height);
+ }
+
public static Rect ToPerspex(this Pango.Rectangle rect)
{
return new Rect(
@@ -36,37 +43,7 @@ namespace Perspex.Cairo
public static Pango.Weight ToCairo(this Perspex.Media.FontWeight weight)
{
- if (weight == Perspex.Media.FontWeight.Light)
- {
- return Pango.Weight.Light;
- }
-
- if (weight == Perspex.Media.FontWeight.Normal || weight == Perspex.Media.FontWeight.Regular)
- {
- return Pango.Weight.Normal;
- }
-
- if (weight == Perspex.Media.FontWeight.DemiBold || weight == Perspex.Media.FontWeight.Medium)
- {
- return Pango.Weight.Semibold;
- }
-
- if (weight == Perspex.Media.FontWeight.Bold)
- {
- return Pango.Weight.Bold;
- }
-
- if (weight == Perspex.Media.FontWeight.UltraBold || weight == Perspex.Media.FontWeight.ExtraBold)
- {
- return Pango.Weight.Ultrabold;
- }
-
- if (weight == Perspex.Media.FontWeight.Black || weight == Perspex.Media.FontWeight.Heavy || weight == Perspex.Media.FontWeight.UltraBlack)
- {
- return Pango.Weight.Heavy;
- }
-
- return Pango.Weight.Ultralight;
+ return (Pango.Weight)weight;
}
public static Pango.Alignment ToCairo(this Perspex.Media.TextAlignment alignment)
diff --git a/src/Gtk/Perspex.Cairo/CairoPlatform.cs b/src/Gtk/Perspex.Cairo/CairoPlatform.cs
index 827014afb4..f25aadda95 100644
--- a/src/Gtk/Perspex.Cairo/CairoPlatform.cs
+++ b/src/Gtk/Perspex.Cairo/CairoPlatform.cs
@@ -1,49 +1,48 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Cairo.Media;
+using Perspex.Cairo.Media.Imaging;
+using Perspex.Media;
+using Perspex.Platform;
+using Splat;
namespace Perspex.Cairo
{
- using System;
+ using System.IO;
using global::Cairo;
- using Perspex.Cairo.Media;
- using Perspex.Cairo.Media.Imaging;
- using Perspex.Media;
- using Perspex.Platform;
- using Perspex.Threading;
- using Splat;
public class CairoPlatform : IPlatformRenderInterface
{
- private static CairoPlatform instance = new CairoPlatform();
+ private static readonly CairoPlatform s_instance = new CairoPlatform();
+
+ private static Pango.Context s_pangoContext = CreatePangoContext();
public static void Initialize()
{
var locator = Locator.CurrentMutable;
- locator.Register(() => instance, typeof(IPlatformRenderInterface));
+ locator.Register(() => s_instance, typeof(IPlatformRenderInterface));
}
public IBitmapImpl CreateBitmap(int width, int height)
{
- return new BitmapImpl(new ImageSurface(Format.Argb32, width, height));
+ return new BitmapImpl(new Gdk.Pixbuf(Gdk.Colorspace.Rgb, true, 32, width, height));
}
public IFormattedTextImpl CreateFormattedText(
- string text,
- string fontFamily,
- double fontSize,
+ string text,
+ string fontFamily,
+ double fontSize,
FontStyle fontStyle,
TextAlignment textAlignment,
Perspex.Media.FontWeight fontWeight)
{
- return new FormattedTextImpl(text, fontFamily, fontSize, fontStyle, textAlignment, fontWeight);
+ return new FormattedTextImpl(s_pangoContext, text, fontFamily, fontSize, fontStyle, textAlignment, fontWeight);
}
public IRenderer CreateRenderer(IPlatformHandle handle, double width, double height)
{
- Locator.CurrentMutable.RegisterConstant(this.GetPangoContext(handle), typeof(Pango.Context));
return new Renderer(handle, width, height);
}
@@ -59,22 +58,22 @@ namespace Perspex.Cairo
public IBitmapImpl LoadBitmap(string fileName)
{
- ImageSurface result = new ImageSurface(fileName);
- return new BitmapImpl(result);
+ var pixbuf = new Gdk.Pixbuf(fileName);
+
+ return new BitmapImpl(pixbuf);
+ }
+
+ public IBitmapImpl LoadBitmap(Stream stream)
+ {
+ var pixbuf = new Gdk.Pixbuf(stream);
+
+ return new BitmapImpl(pixbuf);
}
- private Pango.Context GetPangoContext(IPlatformHandle handle)
+ private static Pango.Context CreatePangoContext()
{
- switch (handle.HandleDescriptor)
- {
- case "GtkWindow":
- var window = GLib.Object.GetObject(handle.Handle) as Gtk.Window;
- return window.PangoContext;
- default:
- throw new NotSupportedException(string.Format(
- "Don't know how to get a Pango Context from a '{0}'.",
- handle.HandleDescriptor));
- }
+ Gtk.Application.Init();
+ return new Gtk.Invisible().CreatePangoContext();
}
}
}
diff --git a/src/Gtk/Perspex.Cairo/Media/BrushImpl.cs b/src/Gtk/Perspex.Cairo/Media/BrushImpl.cs
new file mode 100644
index 0000000000..76ad34b19a
--- /dev/null
+++ b/src/Gtk/Perspex.Cairo/Media/BrushImpl.cs
@@ -0,0 +1,17 @@
+using System;
+using global::Cairo;
+
+namespace Perspex.Cairo
+{
+ public abstract class BrushImpl : IDisposable
+ {
+ public Pattern PlatformBrush { get; protected set; }
+
+ public void Dispose()
+ {
+ if (this.PlatformBrush != null)
+ this.PlatformBrush.Dispose();
+ }
+ }
+}
+
diff --git a/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs b/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs
index 39477d2817..03e5ab6879 100644
--- a/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs
+++ b/src/Gtk/Perspex.Cairo/Media/DrawingContext.cs
@@ -1,19 +1,16 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Linq;
+using System.Reactive.Disposables;
+using Perspex.Cairo.Media.Imaging;
+using Perspex.Media;
+
namespace Perspex.Cairo.Media
{
- using System;
- using System.Reactive.Disposables;
- using Perspex.Cairo.Media.Imaging;
- using Perspex.Media;
- using Perspex.Platform;
- using Splat;
+ using Perspex.Media.Imaging;
using Cairo = global::Cairo;
- using IBitmap = Perspex.Media.Imaging.IBitmap;
- using System.Collections.Generic;
///
/// Draws using Direct2D1.
@@ -23,12 +20,7 @@ namespace Perspex.Cairo.Media
///
/// The cairo context.
///
- private Cairo.Context context;
-
- ///
- /// The cairo surface.
- ///
- private Cairo.Surface surface;
+ private readonly Cairo.Context _context;
///
/// Initializes a new instance of the
@@ -47,50 +38,68 @@ namespace Perspex.Cairo.Media
///
+ /// Gets the current transform of the drawing context.
+ ///
public Matrix CurrentTransform
{
- get;
- private set;
- }
-
- public Gdk.Drawable Drawable
- {
- get;
- private set;
- }
+ get; }
///
/// Ends a draw operation.
///
public void Dispose()
{
- this.context.Dispose();
-
- // if (this.surface is Cairo.Win32Surface)
- // {
- if (this.surface != null)
- this.surface.Dispose();
- // }
+ _context.Dispose();
}
+ ///
+ /// Draws a bitmap image.
+ ///
+ ///
@@ -99,15 +108,16 @@ namespace Perspex.Cairo.Media
///
@@ -116,55 +126,32 @@ namespace Perspex.Cairo.Media
/// (impl.Operations);
-
- using (var pop = this.PushTransform(impl.Transform))
+
+ using (var pop = PushTransform(impl.Transform))
{
- while (clone.Count > 0)
- {
- var current = clone.Dequeue();
-
- if (current is BeginOp)
- {
- var bo = current as BeginOp;
- this.context.MoveTo(bo.Point.ToCairo());
- }
- else if (current is LineToOp)
- {
- var lto = current as LineToOp;
- this.context.LineTo(lto.Point.ToCairo());
- }
- else if (current is EndOp)
- {
- if (((EndOp)current).IsClosed)
- this.context.ClosePath();
- }
- else if (current is CurveToOp)
- {
- var cto = current as CurveToOp;
- this.context.CurveTo(cto.Point.ToCairo(), cto.Point2.ToCairo(), cto.Point3.ToCairo());
- }
- }
-
+ _context.AppendPath(impl.Path);
+
if (brush != null)
{
- this.SetBrush(brush, geometry.Bounds.Size);
-
- if (pen != null)
- this.context.FillPreserve();
- else
- this.context.Fill();
+ using (var b = SetBrush(brush, geometry.Bounds.Size))
+ {
+ if (pen != null)
+ _context.FillPreserve();
+ else
+ _context.Fill();
+ }
}
+ }
-
- if (pen != null)
- {
- this.SetPen(pen, geometry.Bounds.Size);
- this.context.Stroke();
- }
+ if (pen != null)
+ {
+ using (var p = SetPen(pen, geometry.Bounds.Size))
+ {
+ _context.Stroke();
+ }
}
}
@@ -175,9 +162,11 @@ namespace Perspex.Cairo.Media
///
@@ -189,10 +178,12 @@ namespace Perspex.Cairo.Media
public void DrawText(Brush foreground, Point origin, FormattedText text)
{
var layout = ((FormattedTextImpl)text.PlatformImpl).Layout;
- this.SetBrush(foreground, new Size(0, 0));
-
- this.context.MoveTo(origin.X, origin.Y);
- Pango.CairoHelper.ShowLayout(this.context, layout);
+ _context.MoveTo(origin.X, origin.Y);
+
+ using (var b = SetBrush(foreground, new Size(0, 0)))
+ {
+ Pango.CairoHelper.ShowLayout(_context, layout);
+ }
}
///
@@ -200,11 +191,13 @@ namespace Perspex.Cairo.Media
///
///
@@ -214,10 +207,10 @@ namespace Perspex.Cairo.Media
/// A disposable used to undo the clip rectangle.
public IDisposable PushClip(Rect clip)
{
- this.context.Rectangle(clip.ToCairo());
- this.context.Clip();
+ _context.Rectangle(clip.ToCairo());
+ _context.Clip();
- return Disposable.Create(() => this.context.ResetClip());
+ return Disposable.Create(() => _context.ResetClip());
}
///
@@ -227,8 +220,15 @@ namespace Perspex.Cairo.Media
/// A disposable used to undo the opacity.
public IDisposable PushOpacity(double opacity)
{
- // TODO: Implement
- return Disposable.Empty;
+ var tmp = opacityOverride;
+
+ if (opacity < 1.0f)
+ opacityOverride = opacity;
+
+ return Disposable.Create(() =>
+ {
+ opacityOverride = tmp;
+ });
}
///
@@ -238,44 +238,84 @@ namespace Perspex.Cairo.Media
/// A disposable used to undo the transformation.
public IDisposable PushTransform(Matrix matrix)
{
- this.context.Transform(matrix.ToCairo());
+ _context.Transform(matrix.ToCairo());
return Disposable.Create(() =>
{
- this.context.Transform(matrix.Invert().ToCairo());
+ _context.Transform(matrix.Invert().ToCairo());
});
}
+
+ private double opacityOverride = 1.0f;
- private void SetBrush(Brush brush, Size destinationSize)
+ private IDisposable SetBrush(Brush brush, Size destinationSize)
{
+ _context.Save ();
+
var solid = brush as SolidColorBrush;
var linearGradientBrush = brush as LinearGradientBrush;
+ var radialGradientBrush = brush as RadialGradientBrush;
+ var imageBrush = brush as ImageBrush;
+ var visualBrush = brush as VisualBrush;
+ BrushImpl impl = null;
- if (solid != null)
+ if (solid != null)
+ {
+ impl = new SolidColorBrushImpl(solid, opacityOverride);
+ }
+ else if (linearGradientBrush != null)
+ {
+ impl = new LinearGradientBrushImpl(linearGradientBrush, destinationSize);
+ }
+ else if (radialGradientBrush != null)
{
- this.context.SetSourceRGBA(
- solid.Color.R / 255.0,
- solid.Color.G / 255.0,
- solid.Color.B / 255.0,
- solid.Color.A / 255.0);
+ impl = new RadialGradientBrushImpl(radialGradientBrush, destinationSize);
}
- else if (linearGradientBrush != null)
- {
- Cairo.LinearGradient g = new Cairo.LinearGradient(linearGradientBrush.StartPoint.X * destinationSize.Width, linearGradientBrush.StartPoint.Y * destinationSize.Height, linearGradientBrush.EndPoint.X * destinationSize.Width, linearGradientBrush.EndPoint.Y * destinationSize.Height);
-
- foreach (var s in linearGradientBrush.GradientStops)
- g.AddColorStopRgb(s.Offset, new Cairo.Color(s.Color.R, s.Color.G, s.Color.B, s.Color.A));
-
- g.Extend = Cairo.Extend.Pad;
+ else if (imageBrush != null)
+ {
+ impl = new ImageBrushImpl(imageBrush, destinationSize);
+ }
+ else if (visualBrush != null)
+ {
+ impl = new VisualBrushImpl(visualBrush, destinationSize);
+ }
+ else
+ {
+ impl = new SolidColorBrushImpl(null, opacityOverride);
+ }
- this.context.SetSource(g);
- }
+ _context.SetSource(impl.PlatformBrush);
+ return Disposable.Create(() =>
+ {
+ impl.Dispose();
+ _context.Restore();
+ });
}
- private void SetPen(Pen pen, Size destinationSize)
+ private IDisposable SetPen(Pen pen, Size destinationSize)
{
- this.SetBrush(pen.Brush, destinationSize);
- this.context.LineWidth = pen.Thickness;
+ if (pen.DashStyle != null)
+ {
+ if (pen.DashStyle.Dashes != null && pen.DashStyle.Dashes.Count > 0)
+ {
+ var cray = pen.DashStyle.Dashes.ToArray();
+ _context.SetDash(cray, pen.DashStyle.Offset);
+ }
+ }
+
+ _context.LineWidth = pen.Thickness;
+ _context.MiterLimit = pen.MiterLimit;
+
+ // Line caps and joins are currently broken on Cairo. I've defaulted them to sensible defaults for now.
+ // Cairo does not have StartLineCap, EndLineCap, and DashCap properties, whereas Direct2D does.
+ // TODO: Figure out a solution for this.
+ _context.LineJoin = Cairo.LineJoin.Miter;
+ _context.LineCap = Cairo.LineCap.Butt;
+
+ if (pen.Brush == null)
+ return Disposable.Empty;
+
+ return SetBrush(pen.Brush, destinationSize);
}
}
}
diff --git a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
index c43dc10fca..45987973b5 100644
--- a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
+++ b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
@@ -1,21 +1,23 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Perspex.Media;
+using Perspex.Platform;
+using Splat;
namespace Perspex.Cairo.Media
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using Perspex.Media;
- using Perspex.Platform;
- using Splat;
-
public class FormattedTextImpl : IFormattedTextImpl
{
+ private Size _size;
+ private string _text;
+
public FormattedTextImpl(
+ Pango.Context context,
string text,
string fontFamily,
double fontSize,
@@ -23,44 +25,46 @@ namespace Perspex.Cairo.Media
TextAlignment textAlignment,
FontWeight fontWeight)
{
- var context = Locator.Current.GetService();
- this.Layout = new Pango.Layout(context);
- this.Layout.SetText(text);
- this.Layout.FontDescription = new Pango.FontDescription
+ Contract.Requires(context != null);
+
+ Layout = new Pango.Layout(context);
+ _text = text;
+ Layout.SetText(text);
+ Layout.FontDescription = new Pango.FontDescription
{
Family = fontFamily,
- Size = Pango.Units.FromDouble(fontSize * 0.73),
+ Size = Pango.Units.FromDouble(fontSize),
Style = (Pango.Style)fontStyle,
Weight = fontWeight.ToCairo()
};
-
- this.Layout.Alignment = textAlignment.ToCairo();
+
+ Layout.Alignment = textAlignment.ToCairo();
+ Layout.Attributes = new Pango.AttrList();
}
- private Size size;
public Size Constraint
{
get
{
- return size;
+ return _size;
}
set
{
- this.size = value;
- this.Layout.Width = Pango.Units.FromDouble(value.Width);
+ _size = value;
+ Layout.Width = double.IsPositiveInfinity(value.Width) ?
+ -1 : Pango.Units.FromDouble(value.Width);
}
}
public Pango.Layout Layout
{
get;
- private set;
}
public void Dispose()
{
- this.Layout.Dispose();
+ Layout.Dispose();
}
public IEnumerable GetLines()
@@ -73,12 +77,14 @@ namespace Perspex.Cairo.Media
int textPosition;
int trailing;
- var isInside = this.Layout.XyToIndex(
+ var isInside = Layout.XyToIndex(
Pango.Units.FromDouble(point.X),
Pango.Units.FromDouble(point.Y),
out textPosition,
out trailing);
+ textPosition = PangoIndexToTextIndex(textPosition);
+
return new TextHitTestResult
{
IsInside = isInside,
@@ -87,20 +93,30 @@ namespace Perspex.Cairo.Media
};
}
+ int PangoIndexToTextIndex(int pangoIndex)
+ {
+ return Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(_text), 0, Math.Min(pangoIndex, _text.Length)).Length;
+ }
+
public Rect HitTestTextPosition(int index)
{
- return this.Layout.IndexToPos(index).ToPerspex();
+ return Layout.IndexToPos(TextIndexToPangoIndex(index)).ToPerspex();
+ }
+
+ int TextIndexToPangoIndex(int textIndex)
+ {
+ return Encoding.UTF8.GetByteCount(textIndex < _text.Length ? _text.Remove(textIndex) : _text);
}
public IEnumerable HitTestTextRange(int index, int length)
{
var ranges = new List();
-
+
for (var i = 0; i < length; i++)
{
- ranges.Add(this.HitTestTextPosition(index+i));
+ ranges.Add(HitTestTextPosition(index + i));
}
-
+
return ranges;
}
@@ -108,14 +124,26 @@ namespace Perspex.Cairo.Media
{
int width;
int height;
- this.Layout.GetPixelSize(out width, out height);
-
+ Layout.GetPixelSize(out width, out height);
+
return new Size(width, height);
}
public void SetForegroundBrush(Brush brush, int startIndex, int count)
{
- // TODO: Implement.
+ var scb = brush as SolidColorBrush;
+ if (scb != null)
+ {
+
+ var color = new Pango.Color();
+ color.Parse(string.Format("#{0}", scb.Color.ToString().Substring(3)));
+
+ var brushAttr = new Pango.AttrForeground(color);
+ brushAttr.StartIndex = (uint)TextIndexToPangoIndex(startIndex);
+ brushAttr.EndIndex = (uint)TextIndexToPangoIndex(startIndex + count);
+
+ Layout.Attributes.Insert(brushAttr);
+ }
}
}
}
diff --git a/src/Gtk/Perspex.Cairo/Media/ImageBrushImpl.cs b/src/Gtk/Perspex.Cairo/Media/ImageBrushImpl.cs
new file mode 100644
index 0000000000..d6c781619c
--- /dev/null
+++ b/src/Gtk/Perspex.Cairo/Media/ImageBrushImpl.cs
@@ -0,0 +1,14 @@
+using System;
+using global::Cairo;
+
+namespace Perspex.Cairo.Media
+{
+ public class ImageBrushImpl : BrushImpl
+ {
+ public ImageBrushImpl(Perspex.Media.ImageBrush brush, Size destinationSize)
+ {
+ this.PlatformBrush = TileBrushes.CreateImageBrush(brush, destinationSize);
+ }
+ }
+}
+
diff --git a/src/Gtk/Perspex.Cairo/Media/Imaging/BitmapImpl.cs b/src/Gtk/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
index 34961e7795..4abecba6c6 100644
--- a/src/Gtk/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
+++ b/src/Gtk/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
@@ -1,41 +1,33 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Platform;
namespace Perspex.Cairo.Media.Imaging
{
- using System;
- using Perspex.Platform;
using Cairo = global::Cairo;
public class BitmapImpl : IBitmapImpl
{
- public BitmapImpl(Cairo.ImageSurface surface)
+ public BitmapImpl(Gdk.Pixbuf pixbuf)
{
- this.Surface = surface;
+ Surface = pixbuf;
}
- public int PixelWidth
- {
- get { return this.Surface.Width; }
- }
+ public int PixelWidth => Surface.Width;
- public int PixelHeight
- {
- get { return this.Surface.Height; }
- }
+ public int PixelHeight => Surface.Height;
- public Cairo.ImageSurface Surface
+ public Gdk.Pixbuf Surface
{
get;
- private set;
}
public void Save(string fileName)
{
- this.Surface.WriteToPng(fileName);
+ // TODO: Test
+ Surface.Save(fileName, "png");
}
}
}
diff --git a/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
index 68404cbf03..db35a22775 100644
--- a/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
+++ b/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
@@ -1,32 +1,44 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Platform;
namespace Perspex.Cairo.Media.Imaging
{
- using System;
- using Perspex.Platform;
using Cairo = global::Cairo;
- public class RenderTargetBitmapImpl : BitmapImpl, IRenderTargetBitmapImpl
+ public class RenderTargetBitmapImpl : IRenderTargetBitmapImpl
{
- public RenderTargetBitmapImpl(
- Cairo.ImageSurface surface)
- : base(surface)
+ public RenderTargetBitmapImpl(Cairo.ImageSurface surface)
{
+ Surface = surface;
+ renderer = new Renderer(Surface);
}
+ public int PixelWidth => Surface.Width;
+
+ public int PixelHeight => Surface.Height;
+
public void Dispose()
{
- this.Surface.Dispose();
+ renderer.Dispose();
}
+ public Cairo.ImageSurface Surface
+ {
+ get;
+ }
+
+ private Renderer renderer;
public void Render(IVisual visual)
{
- Renderer renderer = new Renderer(this.Surface);
renderer.Render(visual, new PlatformHandle(IntPtr.Zero, "RTB"));
}
+
+ public void Save(string fileName)
+ {
+ Surface.WriteToPng(fileName);
+ }
}
}
\ No newline at end of file
diff --git a/src/Gtk/Perspex.Cairo/Media/LinearGradientBrushImpl.cs b/src/Gtk/Perspex.Cairo/Media/LinearGradientBrushImpl.cs
new file mode 100644
index 0000000000..f1502275c7
--- /dev/null
+++ b/src/Gtk/Perspex.Cairo/Media/LinearGradientBrushImpl.cs
@@ -0,0 +1,22 @@
+using System;
+using global::Cairo;
+
+namespace Perspex.Cairo
+{
+ public class LinearGradientBrushImpl : BrushImpl
+ {
+ public LinearGradientBrushImpl(Perspex.Media.LinearGradientBrush brush, Size destinationSize)
+ {
+ var start = brush.StartPoint.ToPixels(destinationSize);
+ var end = brush.EndPoint.ToPixels(destinationSize);
+
+ this.PlatformBrush = new LinearGradient(start.X, start.Y, end.X, end.Y);
+
+ foreach (var stop in brush.GradientStops)
+ ((LinearGradient)this.PlatformBrush).AddColorStop(stop.Offset, stop.Color.ToCairo());
+
+ ((LinearGradient)this.PlatformBrush).Extend = Extend.Pad;
+ }
+ }
+}
+
diff --git a/src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs b/src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs
new file mode 100644
index 0000000000..a345f1869d
--- /dev/null
+++ b/src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs
@@ -0,0 +1,25 @@
+using System;
+using global::Cairo;
+
+namespace Perspex.Cairo
+{
+ public class RadialGradientBrushImpl : BrushImpl
+ {
+ public RadialGradientBrushImpl(Perspex.Media.RadialGradientBrush brush, Size destinationSize)
+ {
+ var center = brush.Center.ToPixels(destinationSize);
+ var gradientOrigin = brush.GradientOrigin.ToPixels(destinationSize);
+ var radius = brush.Radius;
+
+ this.PlatformBrush = new RadialGradient(center.X, center.Y, radius, gradientOrigin.X, gradientOrigin.Y, radius);
+
+ foreach (var stop in brush.GradientStops)
+ {
+ ((LinearGradient)this.PlatformBrush).AddColorStop(stop.Offset, stop.Color.ToCairo());
+ }
+
+ ((LinearGradient)this.PlatformBrush).Extend = Extend.Pad;
+ }
+ }
+}
+
diff --git a/src/Gtk/Perspex.Cairo/Media/SolidColorBrushImpl.cs b/src/Gtk/Perspex.Cairo/Media/SolidColorBrushImpl.cs
new file mode 100644
index 0000000000..10e63f0382
--- /dev/null
+++ b/src/Gtk/Perspex.Cairo/Media/SolidColorBrushImpl.cs
@@ -0,0 +1,22 @@
+using System;
+using global::Cairo;
+
+namespace Perspex.Cairo
+{
+ public class SolidColorBrushImpl : BrushImpl
+ {
+ public SolidColorBrushImpl(Perspex.Media.SolidColorBrush brush, double opacityOverride = 1.0f)
+ {
+ var color = brush?.Color.ToCairo() ?? new Color();
+
+ if (brush != null)
+ color.A = Math.Min(brush.Opacity, color.A);
+
+ if (opacityOverride < 1.0f)
+ color.A = Math.Min(opacityOverride, color.A);
+
+ this.PlatformBrush = new SolidPattern(color);
+ }
+ }
+}
+
diff --git a/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs b/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
index ff9dacca08..a49ac7ef90 100644
--- a/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
+++ b/src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
@@ -1,25 +1,28 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using Perspex.Media;
+using Perspex.Platform;
namespace Perspex.Cairo.Media
{
- using Perspex.Media;
- using Perspex.Platform;
- using System;
- using System.Collections.Generic;
using Cairo = global::Cairo;
public class StreamGeometryContextImpl : IStreamGeometryContextImpl
{
- private StreamGeometryImpl impl;
- public StreamGeometryContextImpl(StreamGeometryImpl imp)
+ public StreamGeometryContextImpl(Cairo.Path path = null)
{
- this.impl = imp;
- this.surf = new Cairo.ImageSurface(Cairo.Format.Argb32, 0, 0);
- this.context = new Cairo.Context(this.surf);
+
+ _surf = new Cairo.ImageSurface (Cairo.Format.Argb32, 0, 0);
+ _context = new Cairo.Context (_surf);
+ this.Path = path;
+
+ if (this.Path != null)
+ {
+ _context.AppendPath(this.Path);
+ }
}
public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
@@ -28,62 +31,43 @@ namespace Perspex.Cairo.Media
public void BeginFigure(Point startPoint, bool isFilled)
{
- this.impl.Operations.Enqueue(new BeginOp { Point = startPoint, IsFilled = isFilled });
+ if (this.Path == null)
+ _context.MoveTo(startPoint.ToCairo());
}
public void BezierTo(Point point1, Point point2, Point point3)
{
- this.impl.Operations.Enqueue(new CurveToOp { Point = point1, Point2 = point2, Point3 = point3 });
+ if (this.Path == null)
+ _context.CurveTo(point1.ToCairo(), point2.ToCairo(), point3.ToCairo());
}
public void LineTo(Point point)
{
- this.impl.Operations.Enqueue(new LineToOp { Point = point });
+ if (this.Path == null)
+ _context.LineTo(point.ToCairo());
}
- private Cairo.Context context;
- private Cairo.ImageSurface surf;
+ private readonly Cairo.Context _context;
+ private readonly Cairo.ImageSurface _surf;
+ public Cairo.Path Path { get; private set; }
+ public Rect Bounds { get; private set; }
public void EndFigure(bool isClosed)
{
- this.impl.Operations.Enqueue(new EndOp { IsClosed = isClosed });
-
- var clone = new Queue(this.impl.Operations);
-
- while (clone.Count > 0)
- {
- var current = clone.Dequeue();
-
- if (current is BeginOp)
- {
- var bo = current as BeginOp;
- context.MoveTo(bo.Point.ToCairo());
- }
- else if (current is LineToOp)
- {
- var lto = current as LineToOp;
- context.LineTo(lto.Point.ToCairo());
- }
- else if (current is EndOp)
- {
- if (((EndOp)current).IsClosed)
- context.ClosePath();
- }
- else if (current is CurveToOp)
- {
- var cto = current as CurveToOp;
- context.CurveTo(cto.Point.ToCairo(), cto.Point2.ToCairo(), cto.Point3.ToCairo());
- }
- }
+ if (this.Path == null)
+ {
+ if (isClosed)
+ _context.ClosePath ();
- var extents = context.StrokeExtents();
- this.impl.Bounds = new Rect(extents.X, extents.Y, extents.Width, extents.Height);
+ Path = _context.CopyPath ();
+ Bounds = _context.FillExtents ().ToPerspex ();
+ }
}
public void Dispose()
{
- context.Dispose();
- surf.Dispose();
+ _context.Dispose ();
+ _surf.Dispose ();
}
}
}
diff --git a/src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs b/src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs
index cf423dbc17..7e7f520f02 100644
--- a/src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs
+++ b/src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs
@@ -1,107 +1,70 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Media;
+using Perspex.Platform;
+using Splat;
+using System.Collections.Generic;
namespace Perspex.Cairo.Media
{
- using System;
- using Perspex.Media;
- using Perspex.Platform;
using Cairo = global::Cairo;
- using Splat;
- using System.Collections.Generic;
-
- public enum CairoGeometryType
- {
- Begin,
- ArcTo,
- LineTo,
- End
- }
-
- public class BeginOp : GeometryOp
- {
- public Point Point { get; set; }
- public bool IsFilled { get; set; }
- }
-
- public class EndOp : GeometryOp
- {
- public bool IsClosed { get; set; }
- }
-
- public class LineToOp : GeometryOp
- {
- public Point Point { get; set; }
- }
-
- public class CurveToOp : GeometryOp
- {
- public Point Point { get; set; }
- public Point Point2 { get; set; }
- public Point Point3 { get; set; }
- }
-
- public abstract class GeometryOp
- {
- }
public class StreamGeometryImpl : IStreamGeometryImpl
{
public StreamGeometryImpl()
{
- this.Operations = new Queue();
+ _impl = new StreamGeometryContextImpl(null);
}
- public StreamGeometryImpl(Queue ops)
+ public StreamGeometryImpl(StreamGeometryContextImpl impl)
{
- this.Operations = ops;
- }
-
- public Queue Operations
- {
- get;
- private set;
+ _impl = impl;
}
public Rect Bounds
{
- get;
- set;
- }
+ get { return _impl.Bounds; }
+ }
- // TODO: Implement
- private Matrix transform = Matrix.Identity;
+ public Cairo.Path Path
+ {
+ get { return _impl.Path; }
+ }
+
+ private readonly StreamGeometryContextImpl _impl;
+
+ private Matrix _transform = Matrix.Identity;
public Matrix Transform
{
- get { return this.transform; }
+ get { return _transform; }
set
{
- if (value != this.Transform)
+ if (value != Transform)
{
- if (!value.IsIdentity)
- {
- this.transform = value;
- }
+ if (!value.IsIdentity)
+ {
+ _transform = value;
+ }
}
}
}
public IStreamGeometryImpl Clone()
- {
- return new StreamGeometryImpl(this.Operations);
+ {
+ return new StreamGeometryImpl(_impl);
}
public Rect GetRenderBounds(double strokeThickness)
{
- return this.Bounds;
+ // TODO: Calculate properly.
+ return Bounds.Inflate(strokeThickness);
}
public IStreamGeometryContextImpl Open()
{
- return new StreamGeometryContextImpl(this);
+ return _impl;
}
}
}
diff --git a/src/Gtk/Perspex.Cairo/Media/TileBrushes.cs b/src/Gtk/Perspex.Cairo/Media/TileBrushes.cs
new file mode 100644
index 0000000000..e08565785a
--- /dev/null
+++ b/src/Gtk/Perspex.Cairo/Media/TileBrushes.cs
@@ -0,0 +1,224 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Cairo;
+using Perspex.Cairo.Media.Imaging;
+using Perspex.Layout;
+using Perspex.Media;
+using Perspex.Platform;
+
+namespace Perspex.Cairo.Media
+{
+ internal static class TileBrushes
+ {
+ public static SurfacePattern CreateImageBrush(ImageBrush brush, Size targetSize)
+ {
+ if (brush.Source == null)
+ {
+ return null;
+ }
+
+ // TODO: This is directly ported from Direct2D and could probably be made more
+ // efficient on cairo by taking advantage of the fact that cairo has Extend.None.
+ var image = ((BitmapImpl)brush.Source.PlatformImpl).Surface;
+ var imageSize = new Size(brush.Source.PixelWidth, brush.Source.PixelHeight);
+ var tileMode = brush.TileMode;
+ var sourceRect = brush.SourceRect.ToPixels(imageSize);
+ var destinationRect = brush.DestinationRect.ToPixels(targetSize);
+ var scale = brush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
+ var translate = CalculateTranslate(brush, sourceRect, destinationRect, scale);
+ var intermediateSize = CalculateIntermediateSize(tileMode, targetSize, destinationRect.Size);
+
+ var intermediate = new ImageSurface (Format.ARGB32, (int)intermediateSize.Width, (int)intermediateSize.Height);
+ using (var context = new Context(intermediate))
+ {
+ Rect drawRect;
+ var transform = CalculateIntermediateTransform(
+ tileMode,
+ sourceRect,
+ destinationRect,
+ scale,
+ translate,
+ out drawRect);
+ context.Rectangle(drawRect.ToCairo());
+ context.Clip();
+ context.Transform(transform.ToCairo());
+ Gdk.CairoHelper.SetSourcePixbuf(context, image, 0, 0);
+ context.Rectangle(0, 0, imageSize.Width, imageSize.Height);
+ context.Fill();
+
+ var result = new SurfacePattern(intermediate);
+
+ if ((brush.TileMode & TileMode.FlipXY) != 0)
+ {
+ // TODO: Currently always FlipXY as that's all cairo supports natively.
+ // Support separate FlipX and FlipY by drawing flipped images to intermediate
+ // surface.
+ result.Extend = Extend.Reflect;
+ }
+ else
+ {
+ result.Extend = Extend.Repeat;
+ }
+
+ if (brush.TileMode != TileMode.None)
+ {
+ var matrix = result.Matrix;
+ matrix.InitTranslate(-destinationRect.X, -destinationRect.Y);
+ result.Matrix = matrix;
+ }
+
+ return result;
+ }
+ }
+
+ public static SurfacePattern CreateVisualBrush(VisualBrush brush, Size targetSize)
+ {
+ var visual = brush.Visual;
+
+ if (visual == null)
+ {
+ return null;
+ }
+
+ var layoutable = visual as ILayoutable;
+
+ if (layoutable?.IsArrangeValid == false)
+ {
+ layoutable.Measure(Size.Infinity);
+ layoutable.Arrange(new Rect(layoutable.DesiredSize));
+ }
+
+ // TODO: This is directly ported from Direct2D and could probably be made more
+ // efficient on cairo by taking advantage of the fact that cairo has Extend.None.
+ var tileMode = brush.TileMode;
+ var sourceRect = brush.SourceRect.ToPixels(layoutable.Bounds.Size);
+ var destinationRect = brush.DestinationRect.ToPixels(targetSize);
+ var scale = brush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
+ var translate = CalculateTranslate(brush, sourceRect, destinationRect, scale);
+ var intermediateSize = CalculateIntermediateSize(tileMode, targetSize, destinationRect.Size);
+
+ using (var intermediate = new ImageSurface(Format.ARGB32, (int)intermediateSize.Width, (int)intermediateSize.Height))
+ using (var context = new Context(intermediate))
+ {
+ Rect drawRect;
+ var transform = CalculateIntermediateTransform(
+ tileMode,
+ sourceRect,
+ destinationRect,
+ scale,
+ translate,
+ out drawRect);
+ var renderer = new Renderer(intermediate);
+
+ context.Rectangle(drawRect.ToCairo());
+ context.Clip();
+ context.Transform(transform.ToCairo());
+ renderer.Render(visual, new PlatformHandle(IntPtr.Zero, "RTB"), transform, drawRect);
+
+ var result = new SurfacePattern(intermediate);
+
+ if ((brush.TileMode & TileMode.FlipXY) != 0)
+ {
+ // TODO: Currently always FlipXY as that's all cairo supports natively.
+ // Support separate FlipX and FlipY by drawing flipped images to intermediate
+ // surface.
+ result.Extend = Extend.Reflect;
+ }
+ else
+ {
+ result.Extend = Extend.Repeat;
+ }
+
+ if (brush.TileMode != TileMode.None)
+ {
+ var matrix = result.Matrix;
+ matrix.InitTranslate(-destinationRect.X, -destinationRect.Y);
+ result.Matrix = matrix;
+ }
+
+ return result;
+ }
+ }
+
+ ///
+ /// Calculates a translate based on a
+ /// A vector with the X and Y translate.
+ private static Vector CalculateTranslate(
+ TileBrush brush,
+ Rect sourceRect,
+ Rect destinationRect,
+ Vector scale)
+ {
+ var x = 0.0;
+ var y = 0.0;
+ var size = sourceRect.Size * scale;
+
+ switch (brush.AlignmentX)
+ {
+ case AlignmentX.Center:
+ x += (destinationRect.Width - size.Width) / 2;
+ break;
+ case AlignmentX.Right:
+ x += destinationRect.Width - size.Width;
+ break;
+ }
+
+ switch (brush.AlignmentY)
+ {
+ case AlignmentY.Center:
+ y += (destinationRect.Height - size.Height) / 2;
+ break;
+ case AlignmentY.Bottom:
+ y += destinationRect.Height - size.Height;
+ break;
+ }
+
+ return new Vector(x, y);
+ }
+
+ private static Size CalculateIntermediateSize(
+ TileMode tileMode,
+ Size targetSize,
+ Size destinationSize)
+ {
+ var result = tileMode == TileMode.None ? targetSize : destinationSize;
+ return result;
+ }
+
+ private static Matrix CalculateIntermediateTransform(
+ TileMode tileMode,
+ Rect sourceRect,
+ Rect destinationRect,
+ Vector scale,
+ Vector translate,
+ out Rect drawRect)
+ {
+ var transform = Matrix.CreateTranslation(-sourceRect.Position) *
+ Matrix.CreateScale(scale) *
+ Matrix.CreateTranslation(translate);
+ Rect dr;
+
+ if (tileMode == TileMode.None)
+ {
+ dr = destinationRect;
+ transform *= Matrix.CreateTranslation(destinationRect.Position);
+ }
+ else
+ {
+ dr = new Rect(destinationRect.Size);
+ }
+
+ drawRect = dr;
+
+ return transform;
+ }
+ }
+}
diff --git a/src/Gtk/Perspex.Cairo/Media/VisualBrushImpl.cs b/src/Gtk/Perspex.Cairo/Media/VisualBrushImpl.cs
new file mode 100644
index 0000000000..634b2b38a5
--- /dev/null
+++ b/src/Gtk/Perspex.Cairo/Media/VisualBrushImpl.cs
@@ -0,0 +1,14 @@
+using System;
+using global::Cairo;
+
+namespace Perspex.Cairo.Media
+{
+ public class VisualBrushImpl : BrushImpl
+ {
+ public VisualBrushImpl(Perspex.Media.VisualBrush brush, Size destinationSize)
+ {
+ this.PlatformBrush = TileBrushes.CreateVisualBrush(brush, destinationSize);
+ }
+ }
+}
+
diff --git a/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj b/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj
index f612517ebd..6e4155d610 100644
--- a/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj
+++ b/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj
@@ -32,22 +32,10 @@
4
-
- gtk-sharp-2.0
-
-
- glib-sharp-2.0
-
-
- gtk-sharp-2.0
-
-
- gtk-sharp-2.0
-
-
- ..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
+
..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll
-
- gtk-sharp-2.0
+
+ ..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
@@ -72,31 +61,43 @@
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
{B09B78D8-9B26-48B0-9149-D64A2F120F3F}
Perspex.Base
+
+ {42472427-4774-4C81-8AFF-9F27B8E31721}
+ Perspex.Layout
+
{EB582467-6ABB-43A1-B052-E981BA910E3A}
Perspex.SceneGraph
+
-
-
\ No newline at end of file
diff --git a/src/NGenerics/Patterns/Visitor/IVisitor.cs b/src/NGenerics/Patterns/Visitor/IVisitor.cs
deleted file mode 100644
index d9460e51a9..0000000000
--- a/src/NGenerics/Patterns/Visitor/IVisitor.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- Copyright 2007-2013 The NGenerics Team
- (https://github.com/ngenerics/ngenerics/wiki/Team)
-
- This program is licensed under the GNU Lesser General Public License (LGPL). You should
- have received a copy of the license along with the source code. If not, an online copy
- of the license can be found at http://www.gnu.org/copyleft/lesser.html.
-*/
-
-
-namespace NGenerics.Patterns.Visitor
-{
- ///
- /// Provides an interface for visitors.
- ///
- /// The type of objects to be visited.
- public interface IVisitor
- {
- ///
- /// Gets a value indicating whether this instance is done performing it's work..
- ///
- /// true if this instance is done; otherwise, false .
- /// Visits the specified object.
- ///
- ///
- /// An in order implementation of the
- /// The type of objects to be visited.
- public sealed class InOrderVisitor : OrderedVisitor
- {
- #region Construction
-
- /// visitor) : base(visitor) { }
-
- #endregion
-
- #region OrderedVisitor Members
-
- ///
- /// Visits the object in post order.
- ///
- ///
- /// Visits the object in pre order.
- ///
- ///
- /// A visitor that tracks (stores) keys from KeyValuePAirs in the order they were visited.
- ///
- /// The type of the keys for the items to be visited.
- /// The type of the values for the items to be visited.
- public sealed class KeyTrackingVisitor : IVisitor>
- {
- #region Globals
-
- private readonly List tracks;
-
- #endregion
-
- #region Construction
-
- /// ();
- }
-
- #endregion
-
- #region Public Members
-
- ///
- /// Gets the tracking list.
- ///
- /// The tracking list.
- public IList TrackingList
- {
- get
- {
- return tracks;
- }
- }
-
- #endregion
-
- #region IVisitor> Members
-
-
- /// obj)
- {
- tracks.Add(obj.Key);
- }
-
- ///
- /// A visitor that visits objects in order (PreOrder, PostOrder, or InOrder).
- /// Used primarily as a base class for Visitors specializing in a specific order type.
- ///
- /// The type of objects to be visited.
- public class OrderedVisitor : IVisitor
- {
- #region Globals
-
- private readonly IVisitor visitorToUse;
-
- #endregion
-
- #region Construction
-
- /// Nothing in Visual Basic). visitorToUse)
- {
- Guard.ArgumentNotNull(visitorToUse, "visitorToUse");
-
- this.visitorToUse = visitorToUse;
- }
-
- #endregion
-
- #region IOrderedVisitor Members
-
- ///
- /// Determines whether this visitor is done.
- ///
- ///
- /// true if this visitor is done; otherwise, false .
- ///
- public bool HasCompleted
- {
- get
- {
- return visitorToUse.HasCompleted;
- }
- }
-
- ///
- /// Visits the object in pre order.
- ///
- ///
- /// Visits the object in post order.
- ///
- ///
- /// Visits the object in order.
- ///
- ///
- /// Gets the visitor to use.
- ///
- /// The visitor to use.
- public IVisitor VisitorToUse
- {
- get
- {
- return visitorToUse;
- }
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/src/NGenerics/Patterns/Visitor/TrackingVisitor.cs b/src/NGenerics/Patterns/Visitor/TrackingVisitor.cs
deleted file mode 100644
index 17d4c67fa4..0000000000
--- a/src/NGenerics/Patterns/Visitor/TrackingVisitor.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- Copyright 2007-2013 The NGenerics Team
- (https://github.com/ngenerics/ngenerics/wiki/Team)
-
- This program is licensed under the GNU Lesser General Public License (LGPL). You should
- have received a copy of the license along with the source code. If not, an online copy
- of the license can be found at http://www.gnu.org/copyleft/lesser.html.
-*/
-
-
-using System.Collections.Generic;
-
-namespace NGenerics.Patterns.Visitor
-{
- ///
- /// A visitor that tracks (stores) objects in the order they were visited.
- /// Handy for demonstrating and testing different ordered visits implementations on
- /// data structures.
- ///
- /// The type of objects to be visited.
- public sealed class TrackingVisitor : IVisitor
- {
- #region Globals
-
- private readonly List tracks;
-
- #endregion
-
- #region Construction
-
-
- /// ();
- }
-
- #endregion
-
- #region IVisitor Members
- ///
- /// Gets the tracking list.
- ///
- /// The tracking list.
- public IList TrackingList
- {
- get
- {
- return tracks;
- }
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/src/NGenerics/Patterns/Visitor/ValueTrackingVisitor.cs b/src/NGenerics/Patterns/Visitor/ValueTrackingVisitor.cs
deleted file mode 100644
index 01d79e6617..0000000000
--- a/src/NGenerics/Patterns/Visitor/ValueTrackingVisitor.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- Copyright 2007-2013 The NGenerics Team
- (https://github.com/ngenerics/ngenerics/wiki/Team)
-
- This program is licensed under the GNU Lesser General Public License (LGPL). You should
- have received a copy of the license along with the source code. If not, an online copy
- of the license can be found at http://www.gnu.org/copyleft/lesser.html.
-*/
-
-
-using System.Collections.Generic;
-
-namespace NGenerics.Patterns.Visitor
-{
- ///
- /// A visitor that tracks (stores) keys from KeyValuePairs in the order they were visited.
- ///
- /// The type of key of the KeyValuePair.
- /// The type of value of the KeyValuePair.
- public sealed class ValueTrackingVisitor : IVisitor>
- {
- #region Globals
-
- private readonly List tracks;
-
- #endregion
-
- #region Construction
-
-
- /// ();
- }
-
- #endregion
-
- #region Public Members
-
- ///
- /// Gets the tracking list.
- ///
- /// The tracking list.
- public IList TrackingList
- {
- get
- {
- return tracks;
- }
- }
-
- #endregion
-
- #region IVisitor> Members
-
-
- /// obj)
- {
- tracks.Add(obj.Value);
- }
-
- ///
- /// Performs common argument validation.
- ///
- public static class Guard
- {
- #region Methods
-
- ///
- /// Checks a string argument to ensure it isn't null or empty.
- ///
- ///
- /// Checks an argument to ensure it isn't null.
- ///
- ///
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Linq;
namespace Perspex.Animation
{
- using System.Linq;
-
///
/// Base class for control which can have property transitions.
///
@@ -16,7 +13,7 @@ namespace Perspex.Animation
///
/// The property transitions for the control.
///
- private PropertyTransitions propertyTransitions;
+ private PropertyTransitions _propertyTransitions;
///
/// Gets or sets the property transitions for the control.
@@ -28,17 +25,17 @@ namespace Perspex.Animation
{
get
{
- if (this.propertyTransitions == null)
+ if (_propertyTransitions == null)
{
- this.propertyTransitions = new PropertyTransitions();
+ _propertyTransitions = new PropertyTransitions();
}
- return this.propertyTransitions;
+ return _propertyTransitions;
}
set
{
- this.propertyTransitions = value;
+ _propertyTransitions = value;
}
}
@@ -49,9 +46,9 @@ namespace Perspex.Animation
///
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reactive.Linq;
+using Perspex.Threading;
namespace Perspex.Animation
{
- using System;
- using System.Diagnostics;
- using System.Linq;
- using System.Reactive.Linq;
- using Perspex.Threading;
-
///
/// Utilities for creating animations.
///
@@ -48,9 +45,7 @@ namespace Perspex.Animation
///
public static Stopwatch Stopwatch
{
- get;
- private set;
- }
+ get; }
///
/// Gets the animation timer.
@@ -65,9 +60,7 @@ namespace Perspex.Animation
///
public static IObservable Timer
{
- get;
- private set;
- }
+ get; }
///
/// Gets a timer that fires every frame for the specified duration.
diff --git a/src/Perspex.Animation/Animation.cs b/src/Perspex.Animation/Animation.cs
index 1afd8c02b2..26e839e154 100644
--- a/src/Perspex.Animation/Animation.cs
+++ b/src/Perspex.Animation/Animation.cs
@@ -1,13 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Animation
{
- using System;
-
///
/// Tracks the progress of an animation.
///
@@ -16,12 +13,12 @@ namespace Perspex.Animation
///
/// The animation being tracked.
///
- private IObservable inner;
+ private readonly IObservable _inner;
///
/// The disposable used to cancel the animation.
///
- private IDisposable subscription;
+ private readonly IDisposable _subscription;
///
/// Initializes a new instance of the inner, IDisposable subscription)
{
- this.inner = inner;
- this.subscription = subscription;
+ _inner = inner;
+ _subscription = subscription;
}
///
@@ -39,7 +36,7 @@ namespace Perspex.Animation
///
public void Dispose()
{
- this.subscription.Dispose();
+ _subscription.Dispose();
}
///
@@ -52,7 +49,7 @@ namespace Perspex.Animation
///
public IDisposable Subscribe(IObserver observer)
{
- return this.inner.Subscribe(observer);
+ return _inner.Subscribe(observer);
}
}
}
diff --git a/src/Perspex.Animation/AnimationExtensions.cs b/src/Perspex.Animation/AnimationExtensions.cs
index f6b8ede055..e78de91219 100644
--- a/src/Perspex.Animation/AnimationExtensions.cs
+++ b/src/Perspex.Animation/AnimationExtensions.cs
@@ -1,13 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Animation
{
- using System;
-
///
/// Defines animation extension methods.
///
diff --git a/src/Perspex.Animation/Animation`1.cs b/src/Perspex.Animation/Animation`1.cs
index d986fd7436..be04a5a33d 100644
--- a/src/Perspex.Animation/Animation`1.cs
+++ b/src/Perspex.Animation/Animation`1.cs
@@ -1,13 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Animation
{
- using System;
-
///
/// Tracks the progress of an animation.
///
@@ -17,12 +14,12 @@ namespace Perspex.Animation
///
/// The animation being tracked.
///
- private IObservable inner;
+ private readonly IObservable _inner;
///
/// The disposable used to cancel the animation.
///
- private IDisposable subscription;
+ private readonly IDisposable _subscription;
///
/// Initializes a new instance of the inner, IDisposable subscription)
{
- this.inner = inner;
- this.subscription = subscription;
+ _inner = inner;
+ _subscription = subscription;
}
///
@@ -40,7 +37,7 @@ namespace Perspex.Animation
///
public void Dispose()
{
- this.subscription.Dispose();
+ _subscription.Dispose();
}
///
@@ -53,7 +50,7 @@ namespace Perspex.Animation
///
public IDisposable Subscribe(IObserver observer)
{
- return this.inner.Subscribe(observer);
+ return _inner.Subscribe(observer);
}
}
}
diff --git a/src/Perspex.Animation/IEasing.cs b/src/Perspex.Animation/IEasing.cs
index f9dc0f85d5..34dab15f9f 100644
--- a/src/Perspex.Animation/IEasing.cs
+++ b/src/Perspex.Animation/IEasing.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Animation
{
diff --git a/src/Perspex.Animation/IEasing`1.cs b/src/Perspex.Animation/IEasing`1.cs
index 98d2c81743..aa042d188d 100644
--- a/src/Perspex.Animation/IEasing`1.cs
+++ b/src/Perspex.Animation/IEasing`1.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Animation
{
diff --git a/src/Perspex.Animation/LinearDoubleEasing.cs b/src/Perspex.Animation/LinearDoubleEasing.cs
index ee1838ab73..5953c720b3 100644
--- a/src/Perspex.Animation/LinearDoubleEasing.cs
+++ b/src/Perspex.Animation/LinearDoubleEasing.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Animation
{
@@ -38,7 +35,7 @@ namespace Perspex.Animation
///
object IEasing.Ease(double progress, object start, object finish)
{
- return this.Ease(progress, (double)start, (double)finish);
+ return Ease(progress, (double)start, (double)finish);
}
}
}
diff --git a/src/Perspex.Animation/LinearEasing.cs b/src/Perspex.Animation/LinearEasing.cs
index a959fe9f18..716ed2e6f5 100644
--- a/src/Perspex.Animation/LinearEasing.cs
+++ b/src/Perspex.Animation/LinearEasing.cs
@@ -1,13 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Animation
{
- using System;
-
///
/// Returns a linear
diff --git a/src/Perspex.Animation/Perspex.Animation.csproj b/src/Perspex.Animation/Perspex.Animation.csproj
index 1ff6b3572b..fc2d252ecd 100644
--- a/src/Perspex.Animation/Perspex.Animation.csproj
+++ b/src/Perspex.Animation/Perspex.Animation.csproj
@@ -1,5 +1,5 @@
-
+
11.0
@@ -38,7 +38,7 @@
- {b09b78d8-9b26-48b0-9149-d64a2f120f3f}
+ {B09B78D8-9B26-48B0-9149-D64A2F120F3F}
Perspex.Base
@@ -76,9 +76,6 @@
-
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -120,9 +120,6 @@
-
+
+
+
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
+ Perspex.Animation
+
+
+ {B09B78D8-9B26-48B0-9149-D64A2F120F3F}
+ Perspex.Base
+
+
+ {D2221C82-4A25-4583-9B43-D791E3F6820C}
+ Perspex.Controls
+
+
+ {62024B2D-53EB-4638-B26B-85EEAA54866E}
+ Perspex.Input
+
+
+ {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}
+ Perspex.Interactivity
+
+
+ {42472427-4774-4C81-8AFF-9F27B8E31721}
+ Perspex.Layout
+
+
+ {EB582467-6ABB-43A1-B052-E981BA910E3A}
+ Perspex.SceneGraph
+
+
+ {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}
+ Perspex.Styling
+
+
+
+
+
+
+ ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
+
+
+ ..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
+
+
+ ..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj.DotSettings b/src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj.DotSettings
new file mode 100644
index 0000000000..73e96563f9
--- /dev/null
+++ b/src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj.DotSettings
@@ -0,0 +1,2 @@
+
+ CSharp60
\ No newline at end of file
diff --git a/src/NGenerics/Properties/AssemblyInfo.cs b/src/Perspex.HtmlRenderer/Properties/AssemblyInfo.cs
similarity index 85%
rename from src/NGenerics/Properties/AssemblyInfo.cs
rename to src/Perspex.HtmlRenderer/Properties/AssemblyInfo.cs
index f36d08c227..9ab512fab5 100644
--- a/src/NGenerics/Properties/AssemblyInfo.cs
+++ b/src/Perspex.HtmlRenderer/Properties/AssemblyInfo.cs
@@ -6,12 +6,12 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("NGenerics")]
+[assembly: AssemblyTitle("Perspex.HtmlRenderer")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NGenerics")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyProduct("Perspex.HtmlRenderer")]
+[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
diff --git a/src/Perspex.HtmlRenderer/PropertyHelper.cs b/src/Perspex.HtmlRenderer/PropertyHelper.cs
new file mode 100644
index 0000000000..bd322babf0
--- /dev/null
+++ b/src/Perspex.HtmlRenderer/PropertyHelper.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Perspex.HtmlRenderer
+{
+ static class PropertyHelper
+ {
+
+ public static PerspexProperty Register(string name, T def, Action changed) where TOwner : PerspexObject
+ {
+ var pp = PerspexProperty.Register(name, def);
+ Action cb = args =>
+ {
+ changed(args.Sender, args);
+ };
+
+ pp.Changed.Subscribe(cb);
+ return pp;
+ }
+ }
+}
diff --git a/src/Perspex.HtmlRenderer/Utilities/Util.cs b/src/Perspex.HtmlRenderer/Utilities/Util.cs
new file mode 100644
index 0000000000..10722785a6
--- /dev/null
+++ b/src/Perspex.HtmlRenderer/Utilities/Util.cs
@@ -0,0 +1,123 @@
+// "Therefore those skilled at the unorthodox
+// are infinite as heaven and earth,
+// inexhaustible as the great rivers.
+// When they come to an end,
+// they begin again,
+// like the days and months;
+// they die and are reborn,
+// like the four seasons."
+//
+// - Sun Tsu,
+// "The Art of War"
+
+using Perspex;
+using Perspex.Media;
+using TheArtOfDev.HtmlRenderer.Adapters.Entities;
+
+namespace TheArtOfDev.HtmlRenderer.Perspex.Utilities
+{
+ ///
+ /// Utilities for converting WPF entities to HtmlRenderer core entities.
+ ///
+ internal static class Util
+ {
+ ///
+ /// Convert from WPF point to core point.
+ ///
+ public static RPoint Convert(Point p)
+ {
+ return new RPoint(p.X, p.Y);
+ }
+
+ ///
+ /// Convert from WPF point to core point.
+ ///
+ public static Point[] Convert(RPoint[] points)
+ {
+ Point[] myPoints = new Point[points.Length];
+ for (int i = 0; i < points.Length; i++)
+ myPoints[i] = Convert(points[i]);
+ return myPoints;
+ }
+
+ ///
+ /// Convert from core point to WPF point.
+ ///
+ public static Point Convert(RPoint p)
+ {
+ return new Point(p.X, p.Y);
+ }
+
+ ///
+ /// Convert from core point to WPF point.
+ ///
+ public static Point ConvertRound(RPoint p)
+ {
+ return new Point((int)p.X, (int)p.Y);
+ }
+
+ ///
+ /// Convert from WPF size to core size.
+ ///
+ public static RSize Convert(Size s)
+ {
+ return new RSize(s.Width, s.Height);
+ }
+
+ ///
+ /// Convert from core size to WPF size.
+ ///
+ public static Size Convert(RSize s)
+ {
+ return new Size(s.Width, s.Height);
+ }
+
+ ///
+ /// Convert from core point to WPF point.
+ ///
+ public static Size ConvertRound(RSize s)
+ {
+ return new Size((int)s.Width, (int)s.Height);
+ }
+
+ ///
+ /// Convert from WPF rectangle to core rectangle.
+ ///
+ public static RRect Convert(Rect r)
+ {
+ return new RRect(r.X, r.Y, r.Width, r.Height);
+ }
+
+ ///
+ /// Convert from core rectangle to WPF rectangle.
+ ///
+ public static Rect Convert(RRect r)
+ {
+ return new Rect(r.X, r.Y, r.Width, r.Height);
+ }
+
+ ///
+ /// Convert from core rectangle to WPF rectangle.
+ ///
+ public static Rect ConvertRound(RRect r)
+ {
+ return new Rect((int)r.X, (int)r.Y, (int)r.Width, (int)r.Height);
+ }
+
+ ///
+ /// Convert from WPF color to core color.
+ ///
+ public static RColor Convert(Color c)
+ {
+ return RColor.FromArgb(c.A, c.R, c.G, c.B);
+ }
+
+ ///
+ /// Convert from core color to WPF color.
+ ///
+ public static Color Convert(RColor c)
+ {
+ return Color.FromArgb(c.A, c.R, c.G, c.B);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Perspex.HtmlRenderer/external b/src/Perspex.HtmlRenderer/external
new file mode 160000
index 0000000000..9b58697e1c
--- /dev/null
+++ b/src/Perspex.HtmlRenderer/external
@@ -0,0 +1 @@
+Subproject commit 9b58697e1cba93bb86a40eb33b7d8b8fc743e3c0
diff --git a/src/Perspex.HtmlRenderer/packages.config b/src/Perspex.HtmlRenderer/packages.config
new file mode 100644
index 0000000000..c5594cb5ab
--- /dev/null
+++ b/src/Perspex.HtmlRenderer/packages.config
@@ -0,0 +1,8 @@
+
+
+
\ No newline at end of file
diff --git a/src/Perspex.Input/AccessKeyHandler.cs b/src/Perspex.Input/AccessKeyHandler.cs
index ddb508dda2..4cd1a80170 100644
--- a/src/Perspex.Input/AccessKeyHandler.cs
+++ b/src/Perspex.Input/AccessKeyHandler.cs
@@ -1,17 +1,14 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Perspex.Interactivity;
+using Perspex.VisualTree;
namespace Perspex.Input
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using Perspex.Interactivity;
- using Perspex.VisualTree;
-
///
/// Handles access keys for a window.
///
@@ -29,22 +26,22 @@ namespace Perspex.Input
///
/// The registered access keys.
///
- private List> registered = new List>();
+ private readonly List> _registered = new List>();
///
/// The window to which the handler belongs.
///
- private IInputRoot owner;
+ private IInputRoot _owner;
///
/// Whether access keys are currently being shown;
///
- private bool showingAccessKeys;
+ private bool _showingAccessKeys;
///
/// Whether to ignore the Alt KeyUp event.
///
- private bool ignoreAltUp;
+ private bool _ignoreAltUp;
///
/// Gets or sets the window's main menu.
@@ -62,17 +59,17 @@ namespace Perspex.Input
{
Contract.Requires(owner != null);
- if (this.owner != null)
+ if (_owner != null)
{
throw new InvalidOperationException("AccessKeyHandler owner has already been set.");
}
- this.owner = owner;
+ _owner = owner;
- this.owner.AddHandler(InputElement.KeyDownEvent, this.OnPreviewKeyDown, RoutingStrategies.Tunnel);
- this.owner.AddHandler(InputElement.KeyDownEvent, this.OnKeyDown, RoutingStrategies.Bubble);
- this.owner.AddHandler(InputElement.KeyUpEvent, this.OnPreviewKeyUp, RoutingStrategies.Tunnel);
- this.owner.AddHandler(InputElement.PointerPressedEvent, this.OnPreviewPointerPressed, RoutingStrategies.Tunnel);
+ _owner.AddHandler(InputElement.KeyDownEvent, OnPreviewKeyDown, RoutingStrategies.Tunnel);
+ _owner.AddHandler(InputElement.KeyDownEvent, OnKeyDown, RoutingStrategies.Bubble);
+ _owner.AddHandler(InputElement.KeyUpEvent, OnPreviewKeyUp, RoutingStrategies.Tunnel);
+ _owner.AddHandler(InputElement.PointerPressedEvent, OnPreviewPointerPressed, RoutingStrategies.Tunnel);
}
///
@@ -82,14 +79,14 @@ namespace Perspex.Input
///
@@ -98,9 +95,9 @@ namespace Perspex.Input
///
private void CloseMenu()
{
- this.MainMenu.Close();
- this.owner.ShowAccessKeys = this.showingAccessKeys = false;
+ MainMenu.Close();
+ _owner.ShowAccessKeys = _showingAccessKeys = false;
}
}
}
diff --git a/src/Perspex.Input/Cursors.cs b/src/Perspex.Input/Cursors.cs
new file mode 100644
index 0000000000..2c4367d5c0
--- /dev/null
+++ b/src/Perspex.Input/Cursors.cs
@@ -0,0 +1,60 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Splat;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Perspex.Platform;
+
+namespace Perspex.Input
+{
+ /*
+ =========================================================================================
+ NOTE: Cursors are NOT disposable and are cached in platform implementation.
+ To support loading custom cursors some measures about that should be taken beforehand
+ =========================================================================================
+ */
+
+ public enum StandardCursorType
+ {
+ Arrow,
+ Ibeam,
+ Wait,
+ Cross,
+ UpArrow,
+ SizeWestEast,
+ SizeNorthSouth,
+ SizeAll,
+ No,
+ Hand,
+ AppStarting,
+ Help
+
+ // Not available in GTK directly, see http://www.pixelbeat.org/programming/x_cursors/
+ // We might enable them later, preferably, by loading pixmax direclty from theme with fallback image
+ // SizeNorthWestSouthEast,
+ // SizeNorthEastSouthWest,
+ }
+
+ public class Cursor
+ {
+ public static Cursor Default = new Cursor(StandardCursorType.Arrow);
+
+ internal Cursor(IPlatformHandle platformCursor)
+ {
+ PlatformCursor = platformCursor;
+ }
+
+ public Cursor(StandardCursorType cursorType)
+ : this(
+ ((IStandardCursorFactory)Locator.Current.GetService(typeof(IStandardCursorFactory))).GetCursor(
+ cursorType))
+ {
+ }
+
+ public IPlatformHandle PlatformCursor { get; }
+ }
+}
diff --git a/src/Perspex.Input/FocusManager.cs b/src/Perspex.Input/FocusManager.cs
index 864b18cd16..74fb29e683 100644
--- a/src/Perspex.Input/FocusManager.cs
+++ b/src/Perspex.Input/FocusManager.cs
@@ -1,18 +1,15 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Perspex.Interactivity;
+using Perspex.VisualTree;
+using Splat;
namespace Perspex.Input
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using Perspex.Interactivity;
- using Perspex.VisualTree;
- using Splat;
-
///
/// Manages focus for the application.
///
@@ -21,7 +18,7 @@ namespace Perspex.Input
///
/// The focus scopes in which the focus is currently defined.
///
- private Dictionary focusScopes =
+ private readonly Dictionary _focusScopes =
new Dictionary();
///
@@ -31,25 +28,19 @@ namespace Perspex.Input
{
InputElement.PointerPressedEvent.AddClassHandler(
typeof(IInputElement),
- new EventHandler(this.OnPreviewPointerPressed),
+ new EventHandler(OnPreviewPointerPressed),
RoutingStrategies.Tunnel);
}
///
/// Gets the instance of the
- public static IFocusManager Instance
- {
- get { return Locator.Current.GetService(); }
- }
+ public static IFocusManager Instance => Locator.Current.GetService();
///
/// Gets the currently focused
- public IInputElement Current
- {
- get { return KeyboardDevice.Instance.FocusedElement; }
- }
+ public IInputElement Current => KeyboardDevice.Instance.FocusedElement;
///
/// Gets the current focus scope.
@@ -74,20 +65,20 @@ namespace Perspex.Input
if (scope != null)
{
- this.Scope = scope;
- this.SetFocusedElement(scope, control, method);
+ Scope = scope;
+ SetFocusedElement(scope, control, method);
}
}
- else if (this.Current != null)
+ else if (Current != null)
{
// If control is null, set focus to the topmost focus scope.
- foreach (var scope in GetFocusScopeAncestors(this.Current).Reverse().ToList())
+ foreach (var scope in GetFocusScopeAncestors(Current).Reverse().ToList())
{
IInputElement element;
- if (this.focusScopes.TryGetValue(scope, out element))
+ if (_focusScopes.TryGetValue(scope, out element))
{
- this.Focus(element, method);
+ Focus(element, method);
break;
}
}
@@ -111,9 +102,9 @@ namespace Perspex.Input
{
Contract.Requires(scope != null);
- this.focusScopes[scope] = element;
+ _focusScopes[scope] = element;
- if (this.Scope == scope)
+ if (Scope == scope)
{
KeyboardDevice.Instance.SetFocusedElement(element, method);
}
@@ -129,17 +120,17 @@ namespace Perspex.Input
IInputElement e;
- if (!this.focusScopes.TryGetValue(scope, out e))
+ if (!_focusScopes.TryGetValue(scope, out e))
{
// TODO: Make this do something useful, i.e. select the first focusable
// control, select a control that the user has specified to have default
// focus etc.
e = scope as IInputElement;
- this.focusScopes.Add(scope, e);
+ _focusScopes.Add(scope, e);
}
- this.Scope = scope;
- this.Focus(e);
+ Scope = scope;
+ Focus(e);
}
///
@@ -191,7 +182,7 @@ namespace Perspex.Input
if (element != null)
{
- this.Focus(element, NavigationMethod.Pointer);
+ Focus(element, NavigationMethod.Pointer);
}
}
}
diff --git a/src/Perspex.Input/FocusNavigationDirection.cs b/src/Perspex.Input/FocusNavigationDirection.cs
index 307f11cabd..f4f98b9ec5 100644
--- a/src/Perspex.Input/FocusNavigationDirection.cs
+++ b/src/Perspex.Input/FocusNavigationDirection.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/GlobalSuppressions.cs b/src/Perspex.Input/GlobalSuppressions.cs
deleted file mode 100644
index 3d080850f1..0000000000
--- a/src/Perspex.Input/GlobalSuppressions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(
- "StyleCop.CSharp.MaintainabilityRules",
- "SA1401:Fields must be private",
- Justification = "PerspexProperty fields should not be private.")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(
- "StyleCop.CSharp.DocumentationRules",
- "SA1609:Property documentation must have value",
- Justification = "This rule is fscking pointless")]
\ No newline at end of file
diff --git a/src/Perspex.Input/GotFocusEventArgs.cs b/src/Perspex.Input/GotFocusEventArgs.cs
index cf7cd12bde..492ea75074 100644
--- a/src/Perspex.Input/GotFocusEventArgs.cs
+++ b/src/Perspex.Input/GotFocusEventArgs.cs
@@ -1,13 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Interactivity;
namespace Perspex.Input
{
- using Perspex.Interactivity;
-
///
/// Holds arguments for a
diff --git a/src/Perspex.Input/IAccessKeyHandler.cs b/src/Perspex.Input/IAccessKeyHandler.cs
index 1d6bcc3c26..061b217426 100644
--- a/src/Perspex.Input/IAccessKeyHandler.cs
+++ b/src/Perspex.Input/IAccessKeyHandler.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/ICloseable.cs b/src/Perspex.Input/ICloseable.cs
index 075404bf06..4ea2e3249d 100644
--- a/src/Perspex.Input/ICloseable.cs
+++ b/src/Perspex.Input/ICloseable.cs
@@ -1,13 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Input
{
- using System;
-
public interface ICloseable
{
event EventHandler Closed;
diff --git a/src/Perspex.Input/IFocusManager.cs b/src/Perspex.Input/IFocusManager.cs
index c9caf46d64..c813c82338 100644
--- a/src/Perspex.Input/IFocusManager.cs
+++ b/src/Perspex.Input/IFocusManager.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/IFocusScope.cs b/src/Perspex.Input/IFocusScope.cs
index 210ad38269..e6f2c847b2 100644
--- a/src/Perspex.Input/IFocusScope.cs
+++ b/src/Perspex.Input/IFocusScope.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/IInputDevice.cs b/src/Perspex.Input/IInputDevice.cs
index e2ba98a205..5116043dec 100644
--- a/src/Perspex.Input/IInputDevice.cs
+++ b/src/Perspex.Input/IInputDevice.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/IInputElement.cs b/src/Perspex.Input/IInputElement.cs
index 3ce3c5d9d0..c2ae73e3c5 100644
--- a/src/Perspex.Input/IInputElement.cs
+++ b/src/Perspex.Input/IInputElement.cs
@@ -1,14 +1,12 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Diagnostics.Contracts;
+using System;
+using Perspex.Interactivity;
namespace Perspex.Input
{
- using System;
- using Perspex.Interactivity;
-
///
/// Defines input-related functionality for a control.
///
@@ -79,6 +77,11 @@ namespace Perspex.Input
///
bool IsEnabled { get; }
+ ///
+ /// Gets or sets the associated mouse cursor.
+ ///
+ Cursor Cursor { get; }
+
///
/// Gets a value indicating whether the control is effectively enabled for user interaction.
///
diff --git a/src/Perspex.Input/IInputManager.cs b/src/Perspex.Input/IInputManager.cs
index aafc4002fd..4f61f8f756 100644
--- a/src/Perspex.Input/IInputManager.cs
+++ b/src/Perspex.Input/IInputManager.cs
@@ -1,15 +1,12 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Input.Raw;
+using Perspex.Layout;
namespace Perspex.Input
{
- using System;
- using Perspex.Input.Raw;
- using Perspex.Layout;
-
public interface IInputManager
{
IObservable RawEventReceived { get; }
diff --git a/src/Perspex.Input/IInputRoot.cs b/src/Perspex.Input/IInputRoot.cs
index 03f9ab3502..631e23b78e 100644
--- a/src/Perspex.Input/IInputRoot.cs
+++ b/src/Perspex.Input/IInputRoot.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
@@ -21,6 +18,11 @@ namespace Perspex.Input
///
IKeyboardNavigationHandler KeyboardNavigationHandler { get; }
+ ///
+ /// Gets or sets the input element that the pointer is currently over.
+ ///
+ IInputElement PointerOverElement { get; set; }
+
///
/// Gets or sets a value indicating whether access keys are shown in the window.
///
diff --git a/src/Perspex.Input/IKeyboardDevice.cs b/src/Perspex.Input/IKeyboardDevice.cs
index 71bed251a9..40c790e270 100644
--- a/src/Perspex.Input/IKeyboardDevice.cs
+++ b/src/Perspex.Input/IKeyboardDevice.cs
@@ -1,13 +1,10 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Input
{
- using System;
-
[Flags]
public enum ModifierKeys
{
@@ -30,8 +27,6 @@ namespace Perspex.Input
{
IInputElement FocusedElement { get; }
- ModifierKeys Modifiers { get; }
-
void SetFocusedElement(IInputElement element, NavigationMethod method);
}
}
diff --git a/src/Perspex.Input/IKeyboardNavigationHandler.cs b/src/Perspex.Input/IKeyboardNavigationHandler.cs
index fb997e3875..fd79e941b6 100644
--- a/src/Perspex.Input/IKeyboardNavigationHandler.cs
+++ b/src/Perspex.Input/IKeyboardNavigationHandler.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/IMainMenu.cs b/src/Perspex.Input/IMainMenu.cs
index 08aa640719..afe954c78a 100644
--- a/src/Perspex.Input/IMainMenu.cs
+++ b/src/Perspex.Input/IMainMenu.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/IMouseDevice.cs b/src/Perspex.Input/IMouseDevice.cs
index b4b30ee65b..9b5a7281b3 100644
--- a/src/Perspex.Input/IMouseDevice.cs
+++ b/src/Perspex.Input/IMouseDevice.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/INavigableContainer.cs b/src/Perspex.Input/INavigableContainer.cs
index a03e037022..7e65dd1d44 100644
--- a/src/Perspex.Input/INavigableContainer.cs
+++ b/src/Perspex.Input/INavigableContainer.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/IPointerDevice.cs b/src/Perspex.Input/IPointerDevice.cs
index 2d8667b30d..8af791b745 100644
--- a/src/Perspex.Input/IPointerDevice.cs
+++ b/src/Perspex.Input/IPointerDevice.cs
@@ -1,14 +1,11 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Interactivity;
namespace Perspex.Input
{
- using System;
- using Perspex.Interactivity;
-
public interface IPointerDevice : IInputDevice
{
IInputElement Captured { get; }
diff --git a/src/Perspex.Input/InputElement.cs b/src/Perspex.Input/InputElement.cs
index 154f71b32a..639cf94003 100644
--- a/src/Perspex.Input/InputElement.cs
+++ b/src/Perspex.Input/InputElement.cs
@@ -1,17 +1,14 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Linq;
+using Perspex.Interactivity;
+using Perspex.Rendering;
+using Perspex.VisualTree;
namespace Perspex.Input
{
- using System;
- using System.Linq;
- using Perspex.Interactivity;
- using Perspex.Rendering;
- using Perspex.VisualTree;
-
///
/// Implements input-related functionality for a control.
///
@@ -35,6 +32,12 @@ namespace Perspex.Input
public static readonly PerspexProperty IsEnabledCoreProperty =
PerspexProperty.Register("IsEnabledCore", true);
+ ///
+ /// Gets or sets associated mouse cursor.
+ ///
+ public static readonly PerspexProperty CursorProperty =
+ PerspexProperty.Register("Cursor", null, true);
+
///
/// Defines the
@@ -158,8 +161,8 @@ namespace Perspex.Input
///
public event EventHandler GotFocus
{
- add { this.AddHandler(GotFocusEvent, value); }
- remove { this.RemoveHandler(GotFocusEvent, value); }
+ add { AddHandler(GotFocusEvent, value); }
+ remove { RemoveHandler(GotFocusEvent, value); }
}
///
@@ -167,8 +170,8 @@ namespace Perspex.Input
///
public event EventHandler LostFocus
{
- add { this.AddHandler(LostFocusEvent, value); }
- remove { this.RemoveHandler(LostFocusEvent, value); }
+ add { AddHandler(LostFocusEvent, value); }
+ remove { RemoveHandler(LostFocusEvent, value); }
}
///
@@ -176,8 +179,8 @@ namespace Perspex.Input
///
public event EventHandler KeyDown
{
- add { this.AddHandler(KeyDownEvent, value); }
- remove { this.RemoveHandler(KeyDownEvent, value); }
+ add { AddHandler(KeyDownEvent, value); }
+ remove { RemoveHandler(KeyDownEvent, value); }
}
///
@@ -185,8 +188,8 @@ namespace Perspex.Input
///
public event EventHandler KeyUp
{
- add { this.AddHandler(KeyUpEvent, value); }
- remove { this.RemoveHandler(KeyUpEvent, value); }
+ add { AddHandler(KeyUpEvent, value); }
+ remove { RemoveHandler(KeyUpEvent, value); }
}
///
@@ -194,8 +197,8 @@ namespace Perspex.Input
///
public event EventHandler TextInput
{
- add { this.AddHandler(TextInputEvent, value); }
- remove { this.RemoveHandler(TextInputEvent, value); }
+ add { AddHandler(TextInputEvent, value); }
+ remove { RemoveHandler(TextInputEvent, value); }
}
///
@@ -203,8 +206,8 @@ namespace Perspex.Input
///
public event EventHandler PointerEnter
{
- add { this.AddHandler(PointerEnterEvent, value); }
- remove { this.RemoveHandler(PointerEnterEvent, value); }
+ add { AddHandler(PointerEnterEvent, value); }
+ remove { RemoveHandler(PointerEnterEvent, value); }
}
///
@@ -212,8 +215,8 @@ namespace Perspex.Input
///
public event EventHandler PointerLeave
{
- add { this.AddHandler(PointerLeaveEvent, value); }
- remove { this.RemoveHandler(PointerLeaveEvent, value); }
+ add { AddHandler(PointerLeaveEvent, value); }
+ remove { RemoveHandler(PointerLeaveEvent, value); }
}
///
@@ -221,8 +224,8 @@ namespace Perspex.Input
///
public event EventHandler PointerMoved
{
- add { this.AddHandler(PointerMovedEvent, value); }
- remove { this.RemoveHandler(PointerMovedEvent, value); }
+ add { AddHandler(PointerMovedEvent, value); }
+ remove { RemoveHandler(PointerMovedEvent, value); }
}
///
@@ -230,8 +233,8 @@ namespace Perspex.Input
///
public event EventHandler PointerPressed
{
- add { this.AddHandler(PointerPressedEvent, value); }
- remove { this.RemoveHandler(PointerPressedEvent, value); }
+ add { AddHandler(PointerPressedEvent, value); }
+ remove { RemoveHandler(PointerPressedEvent, value); }
}
///
@@ -239,8 +242,8 @@ namespace Perspex.Input
///
public event EventHandler PointerReleased
{
- add { this.AddHandler(PointerReleasedEvent, value); }
- remove { this.RemoveHandler(PointerReleasedEvent, value); }
+ add { AddHandler(PointerReleasedEvent, value); }
+ remove { RemoveHandler(PointerReleasedEvent, value); }
}
///
@@ -248,8 +251,8 @@ namespace Perspex.Input
///
public event EventHandler PointerWheelChanged
{
- add { this.AddHandler(PointerWheelChangedEvent, value); }
- remove { this.RemoveHandler(PointerWheelChangedEvent, value); }
+ add { AddHandler(PointerWheelChangedEvent, value); }
+ remove { RemoveHandler(PointerWheelChangedEvent, value); }
}
///
@@ -257,8 +260,8 @@ namespace Perspex.Input
///
public bool Focusable
{
- get { return this.GetValue(FocusableProperty); }
- set { this.SetValue(FocusableProperty, value); }
+ get { return GetValue(FocusableProperty); }
+ set { SetValue(FocusableProperty, value); }
}
///
@@ -266,8 +269,17 @@ namespace Perspex.Input
///
public bool IsEnabled
{
- get { return this.GetValue(IsEnabledProperty); }
- set { this.SetValue(IsEnabledProperty, value); }
+ get { return GetValue(IsEnabledProperty); }
+ set { SetValue(IsEnabledProperty, value); }
+ }
+
+ ///
+ /// Gets or sets associated mouse cursor.
+ ///
+ public Cursor Cursor
+ {
+ get { return GetValue(CursorProperty); }
+ set { SetValue(CursorProperty, value); }
}
///
@@ -275,8 +287,8 @@ namespace Perspex.Input
///
public bool IsFocused
{
- get { return this.GetValue(IsFocusedProperty); }
- private set { this.SetValue(IsFocusedProperty, value); }
+ get { return GetValue(IsFocusedProperty); }
+ private set { SetValue(IsFocusedProperty, value); }
}
///
@@ -284,8 +296,8 @@ namespace Perspex.Input
///
public bool IsHitTestVisible
{
- get { return this.GetValue(IsHitTestVisibleProperty); }
- set { this.SetValue(IsHitTestVisibleProperty, value); }
+ get { return GetValue(IsHitTestVisibleProperty); }
+ set { SetValue(IsHitTestVisibleProperty, value); }
}
///
@@ -293,8 +305,8 @@ namespace Perspex.Input
///
public bool IsPointerOver
{
- get { return this.GetValue(IsPointerOverProperty); }
- internal set { this.SetValue(IsPointerOverProperty, value); }
+ get { return GetValue(IsPointerOverProperty); }
+ internal set { SetValue(IsPointerOverProperty, value); }
}
///
@@ -305,10 +317,7 @@ namespace Perspex.Input
/// controls. The
/// Gets a value indicating whether the control is effectively enabled for user interaction.
@@ -320,8 +329,8 @@ namespace Perspex.Input
///
protected bool IsEnabledCore
{
- get { return this.GetValue(IsEnabledCoreProperty); }
- set { this.SetValue(IsEnabledCoreProperty, value); }
+ get { return GetValue(IsEnabledCoreProperty); }
+ set { SetValue(IsEnabledCoreProperty, value); }
}
///
@@ -348,7 +357,7 @@ namespace Perspex.Input
{
base.OnDetachedFromVisualTree(oldRoot);
- if (this.IsFocused)
+ if (IsFocused)
{
FocusManager.Instance.Focus(null);
}
@@ -358,7 +367,7 @@ namespace Perspex.Input
protected override void OnAttachedToVisualTree(IRenderRoot root)
{
base.OnAttachedToVisualTree(root);
- this.UpdateIsEnabledCore();
+ UpdateIsEnabledCore();
}
///
@@ -367,7 +376,7 @@ namespace Perspex.Input
///
@@ -376,7 +385,7 @@ namespace Perspex.Input
///
@@ -409,7 +418,7 @@ namespace Perspex.Input
///
@@ -418,7 +427,7 @@ namespace Perspex.Input
///
@@ -463,7 +472,7 @@ namespace Perspex.Input
///
private void UpdateIsEnabledCore()
{
- this.UpdateIsEnabledCore(this.GetVisualParent());
+ UpdateIsEnabledCore(this.GetVisualParent());
}
///
@@ -475,11 +484,11 @@ namespace Perspex.Input
{
if (parent != null)
{
- this.IsEnabledCore = this.IsEnabled && parent.IsEnabledCore;
+ IsEnabledCore = IsEnabled && parent.IsEnabledCore;
}
else
{
- this.IsEnabledCore = this.IsEnabled;
+ IsEnabledCore = IsEnabled;
}
foreach (var child in this.GetVisualChildren().OfType())
diff --git a/src/Perspex.Input/InputExtensions.cs b/src/Perspex.Input/InputExtensions.cs
index b886ae64fe..f53ecc5524 100644
--- a/src/Perspex.Input/InputExtensions.cs
+++ b/src/Perspex.Input/InputExtensions.cs
@@ -1,15 +1,12 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
namespace Perspex.Input
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
-
public static class InputExtensions
{
public static IEnumerable GetInputElementsAt(this IInputElement element, Point p)
diff --git a/src/Perspex.Input/InputManager.cs b/src/Perspex.Input/InputManager.cs
index 9989a2c05f..5b6338b084 100644
--- a/src/Perspex.Input/InputManager.cs
+++ b/src/Perspex.Input/InputManager.cs
@@ -1,34 +1,31 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Subjects;
+using Perspex.Input.Raw;
+using Splat;
namespace Perspex.Input
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Reactive.Subjects;
- using Perspex.Input.Raw;
- using Splat;
-
public class InputManager : IInputManager
{
- private Subject rawEventReceived = new Subject();
+ private readonly Subject _rawEventReceived = new Subject();
- private Subject postProcess = new Subject();
+ private readonly Subject _postProcess = new Subject();
public static IInputManager Instance => Locator.Current.GetService();
- public IObservable RawEventReceived => this.rawEventReceived;
+ public IObservable RawEventReceived => _rawEventReceived;
- public IObservable PostProcess => this.postProcess;
+ public IObservable PostProcess => _postProcess;
public void Process(RawInputEventArgs e)
{
- this.rawEventReceived.OnNext(e);
- this.postProcess.OnNext(e);
+ _rawEventReceived.OnNext(e);
+ _postProcess.OnNext(e);
}
}
}
diff --git a/src/Perspex.Input/Key.cs b/src/Perspex.Input/Key.cs
index b85aa0b56c..88abaf8294 100644
--- a/src/Perspex.Input/Key.cs
+++ b/src/Perspex.Input/Key.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/KeyEventArgs.cs b/src/Perspex.Input/KeyEventArgs.cs
index 299bb015ef..54f420a71c 100644
--- a/src/Perspex.Input/KeyEventArgs.cs
+++ b/src/Perspex.Input/KeyEventArgs.cs
@@ -1,18 +1,17 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Interactivity;
namespace Perspex.Input
{
- using System;
- using Perspex.Interactivity;
-
public class KeyEventArgs : RoutedEventArgs
{
public IKeyboardDevice Device { get; set; }
public Key Key { get; set; }
+
+ public ModifierKeys Modifiers { get; set; }
}
}
diff --git a/src/Perspex.Input/KeyboardDevice.cs b/src/Perspex.Input/KeyboardDevice.cs
index 2e19cbbd19..8aff90bae4 100644
--- a/src/Perspex.Input/KeyboardDevice.cs
+++ b/src/Perspex.Input/KeyboardDevice.cs
@@ -1,70 +1,56 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Runtime.CompilerServices;
+using Perspex.Input.Raw;
+using Perspex.Interactivity;
+using Splat;
namespace Perspex.Input
{
- using System;
- using System.ComponentModel;
- using System.Linq;
- using System.Reactive.Linq;
- using System.Runtime.CompilerServices;
- using Perspex.Input.Raw;
- using Perspex.Interactivity;
- using Splat;
-
public abstract class KeyboardDevice : IKeyboardDevice, INotifyPropertyChanged
{
- private IInputElement focusedElement;
+ private IInputElement _focusedElement;
public KeyboardDevice()
{
- this.InputManager.RawEventReceived
+ InputManager.RawEventReceived
.OfType()
.Where(x => x.Device == this)
- .Subscribe(this.ProcessRawEvent);
+ .Subscribe(ProcessRawEvent);
}
public event PropertyChangedEventHandler PropertyChanged;
- public static IKeyboardDevice Instance
- {
- get { return Locator.Current.GetService(); }
- }
+ public static IKeyboardDevice Instance => Locator.Current.GetService();
- public IInputManager InputManager
- {
- get { return Locator.Current.GetService(); }
- }
+ public IInputManager InputManager => Locator.Current.GetService();
- public IFocusManager FocusManager
- {
- get { return Locator.Current.GetService(); }
- }
+ public IFocusManager FocusManager => Locator.Current.GetService();
public IInputElement FocusedElement
{
get
{
- return this.focusedElement;
+ return _focusedElement;
}
private set
{
- this.focusedElement = value;
- this.RaisePropertyChanged();
+ _focusedElement = value;
+ RaisePropertyChanged();
}
}
- public abstract ModifierKeys Modifiers { get; }
-
public void SetFocusedElement(IInputElement element, NavigationMethod method)
{
- if (element != this.FocusedElement)
+ if (element != FocusedElement)
{
- var interactive = this.FocusedElement as IInteractive;
+ var interactive = FocusedElement as IInteractive;
if (interactive != null)
{
@@ -74,7 +60,7 @@ namespace Perspex.Input
});
}
- this.FocusedElement = element;
+ FocusedElement = element;
interactive = element as IInteractive;
if (interactive != null)
@@ -90,12 +76,12 @@ namespace Perspex.Input
protected void RaisePropertyChanged([CallerMemberName] string propertyName = "")
{
- this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
private void ProcessRawEvent(RawInputEventArgs e)
{
- IInputElement element = this.FocusedElement;
+ IInputElement element = FocusedElement;
if (element != null)
{
@@ -115,6 +101,7 @@ namespace Perspex.Input
RoutedEvent = routedEvent,
Device = this,
Key = keyInput.Key,
+ Modifiers = keyInput.Modifiers,
Source = element,
};
diff --git a/src/Perspex.Input/KeyboardNavigation.cs b/src/Perspex.Input/KeyboardNavigation.cs
index f0f0c94ac8..a0c84a8cba 100644
--- a/src/Perspex.Input/KeyboardNavigation.cs
+++ b/src/Perspex.Input/KeyboardNavigation.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/KeyboardNavigationHandler.cs b/src/Perspex.Input/KeyboardNavigationHandler.cs
index 175a9ee4ed..4c791d83c1 100644
--- a/src/Perspex.Input/KeyboardNavigationHandler.cs
+++ b/src/Perspex.Input/KeyboardNavigationHandler.cs
@@ -1,14 +1,11 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Input.Navigation;
namespace Perspex.Input
{
- using System;
- using Perspex.Input.Navigation;
-
///
/// Handles keyboard navigation for a window.
///
@@ -17,7 +14,7 @@ namespace Perspex.Input
///
/// The window to which the handler belongs.
///
- private IInputRoot owner;
+ private IInputRoot _owner;
///
/// Sets the owner of the keyboard navigation handler.
@@ -30,14 +27,14 @@ namespace Perspex.Input
{
Contract.Requires(owner != null);
- if (this.owner != null)
+ if (_owner != null)
{
throw new InvalidOperationException("AccessKeyHandler owner has already been set.");
}
- this.owner = owner;
+ _owner = owner;
- this.owner.AddHandler(InputElement.KeyDownEvent, this.OnKeyDown);
+ _owner.AddHandler(InputElement.KeyDownEvent, OnKeyDown);
}
///
@@ -101,7 +98,7 @@ namespace Perspex.Input
switch (e.Key)
{
case Key.Tab:
- direction = (KeyboardDevice.Instance.Modifiers & ModifierKeys.Shift) == 0 ?
+ direction = (e.Modifiers & ModifierKeys.Shift) == 0 ?
FocusNavigationDirection.Next : FocusNavigationDirection.Previous;
break;
case Key.Up:
@@ -120,7 +117,7 @@ namespace Perspex.Input
if (direction.HasValue)
{
- this.Move(current, direction.Value);
+ Move(current, direction.Value);
e.Handled = true;
}
}
diff --git a/src/Perspex.Input/KeyboardNavigationMode.cs b/src/Perspex.Input/KeyboardNavigationMode.cs
index 2f8f8bd4c6..7a66d18aaf 100644
--- a/src/Perspex.Input/KeyboardNavigationMode.cs
+++ b/src/Perspex.Input/KeyboardNavigationMode.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/MouseDevice.cs b/src/Perspex.Input/MouseDevice.cs
index 738c5ca959..9b0fb17ea6 100644
--- a/src/Perspex.Input/MouseDevice.cs
+++ b/src/Perspex.Input/MouseDevice.cs
@@ -1,43 +1,37 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Perspex.Input.Raw;
+using Perspex.Interactivity;
+using Perspex.Platform;
+using Perspex.VisualTree;
+using Splat;
namespace Perspex.Input
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Reactive.Linq;
- using Perspex.Input.Raw;
- using Perspex.Interactivity;
- using Perspex.Platform;
- using Perspex.VisualTree;
- using Splat;
-
public abstract class MouseDevice : IMouseDevice
{
- private int clickCount;
+ private int _clickCount;
- private Rect lastClickRect;
+ private Rect _lastClickRect;
- private uint lastClickTime;
+ private uint _lastClickTime;
- private List pointerOvers = new List();
+ private readonly List _pointerOvers = new List();
public MouseDevice()
{
- this.InputManager.RawEventReceived
+ InputManager.RawEventReceived
.OfType()
.Where(x => x.Device == this)
- .Subscribe(this.ProcessRawEvent);
+ .Subscribe(ProcessRawEvent);
}
- public static IMouseDevice Instance
- {
- get { return Locator.Current.GetService(); }
- }
+ public static IMouseDevice Instance => Locator.Current.GetService();
public IInputElement Captured
{
@@ -45,10 +39,7 @@ namespace Perspex.Input
protected set;
}
- public IInputManager InputManager
- {
- get { return Locator.Current.GetService(); }
- }
+ public IInputManager InputManager => Locator.Current.GetService();
public Point Position
{
@@ -58,12 +49,12 @@ namespace Perspex.Input
public virtual void Capture(IInputElement control)
{
- this.Captured = control;
+ Captured = control;
}
public Point GetPosition(IVisual relativeTo)
{
- Point p = this.Position;
+ Point p = Position;
IVisual v = relativeTo;
while (v != null)
@@ -79,54 +70,54 @@ namespace Perspex.Input
{
var mouse = (IMouseDevice)e.Device;
- this.Position = e.Position;
+ Position = e.Position;
switch (e.Type)
{
case RawMouseEventType.LeaveWindow:
- this.LeaveWindow(mouse, e.Root);
+ LeaveWindow(mouse, e.Root);
break;
case RawMouseEventType.LeftButtonDown:
- this.MouseDown(mouse, e.Timestamp, e.Root, e.Position);
+ MouseDown(mouse, e.Timestamp, e.Root, e.Position);
break;
case RawMouseEventType.LeftButtonUp:
- this.MouseUp(mouse, e.Root, e.Position);
+ MouseUp(mouse, e.Root, e.Position);
break;
case RawMouseEventType.Move:
- this.MouseMove(mouse, e.Root, e.Position);
+ MouseMove(mouse, e.Root, e.Position);
break;
case RawMouseEventType.Wheel:
- this.MouseWheel(mouse, e.Root, e.Position, ((RawMouseWheelEventArgs)e).Delta);
+ MouseWheel(mouse, e.Root, e.Position, ((RawMouseWheelEventArgs)e).Delta);
break;
}
}
- private void LeaveWindow(IMouseDevice device, IInputElement root)
+ private void LeaveWindow(IMouseDevice device, IInputRoot root)
{
- this.ClearPointerOver(this);
+ ClearPointerOver(this, root);
}
private void MouseDown(IMouseDevice device, uint timestamp, IInputElement root, Point p)
{
- var hit = this.HitTest(root, p);
+ var hit = HitTest(root, p);
if (hit != null)
{
- IInteractive source = this.GetSource(hit);
+ IInteractive source = GetSource(hit);
if (source != null)
{
var settings = Locator.Current.GetService();
var doubleClickTime = settings.DoubleClickTime.TotalMilliseconds;
- if (!this.lastClickRect.Contains(p) || timestamp - this.lastClickTime > doubleClickTime)
+ if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
{
- this.clickCount = 0;
+ _clickCount = 0;
}
- ++this.clickCount;
- this.lastClickTime = timestamp;
- this.lastClickRect = new Rect(p, new Size())
+ ++_clickCount;
+ _lastClickTime = timestamp;
+ _lastClickRect = new Rect(p, new Size())
.Inflate(new Thickness(settings.DoubleClickSize.Width / 2, settings.DoubleClickSize.Height / 2));
var e = new PointerPressEventArgs
@@ -134,7 +125,7 @@ namespace Perspex.Input
Device = this,
RoutedEvent = InputElement.PointerPressedEvent,
Source = source,
- ClickCount = this.clickCount,
+ ClickCount = _clickCount,
};
source.RaiseEvent(e);
@@ -142,46 +133,36 @@ namespace Perspex.Input
}
}
- private void MouseMove(IMouseDevice device, IInputElement root, Point p)
+ private void MouseMove(IMouseDevice device, IInputRoot root, Point p)
{
- IInteractive source;
+ IInputElement source;
- if (this.Captured == null)
+ if (Captured == null)
{
- this.SetPointerOver(this, root, p);
- source = root as IInteractive;
+ source = SetPointerOver(this, root, p);
}
else
{
- Point offset = new Point();
-
- foreach (IVisual ancestor in this.Captured.GetVisualAncestors())
- {
- offset += ancestor.Bounds.Position;
- }
-
- this.SetPointerOver(this, this.Captured, p - offset);
- source = this.Captured as IInteractive;
+ var elements = Captured.GetSelfAndVisualAncestors().OfType().ToList();
+ SetPointerOver(this, root, elements);
+ source = Captured;
}
- if (source != null)
+ source.RaiseEvent(new PointerEventArgs
{
- source.RaiseEvent(new PointerEventArgs
- {
- Device = this,
- RoutedEvent = InputElement.PointerMovedEvent,
- Source = source,
- });
- }
+ Device = this,
+ RoutedEvent = InputElement.PointerMovedEvent,
+ Source = source,
+ });
}
- private void MouseUp(IMouseDevice device, IInputElement root, Point p)
+ private void MouseUp(IMouseDevice device, IInputRoot root, Point p)
{
- var hit = this.HitTest(root, p);
+ var hit = HitTest(root, p);
if (hit != null)
{
- IInteractive source = this.GetSource(hit);
+ IInteractive source = GetSource(hit);
if (source != null)
{
@@ -195,13 +176,13 @@ namespace Perspex.Input
}
}
- private void MouseWheel(IMouseDevice device, IInputElement root, Point p, Vector delta)
+ private void MouseWheel(IMouseDevice device, IInputRoot root, Point p, Vector delta)
{
- var hit = this.HitTest(root, p);
+ var hit = HitTest(root, p);
if (hit != null)
{
- IInteractive source = this.GetSource(hit);
+ IInteractive source = GetSource(hit);
if (source != null)
{
@@ -218,19 +199,19 @@ namespace Perspex.Input
private IInteractive GetSource(IVisual hit)
{
- return this.Captured ??
+ return Captured ??
(hit as IInteractive) ??
hit.GetSelfAndVisualAncestors().OfType().FirstOrDefault();
}
private IInputElement HitTest(IInputElement root, Point p)
{
- return this.Captured ?? root.InputHitTest(p);
+ return Captured ?? root.InputHitTest(p);
}
- private void ClearPointerOver(IPointerDevice device)
+ private void ClearPointerOver(IPointerDevice device, IInputRoot root)
{
- foreach (var control in this.pointerOvers.ToList())
+ foreach (var control in _pointerOvers.ToList())
{
PointerEventArgs e = new PointerEventArgs
{
@@ -239,16 +220,22 @@ namespace Perspex.Input
Source = control,
};
- this.pointerOvers.Remove(control);
+ _pointerOvers.Remove(control);
control.RaiseEvent(e);
}
+
+ root.PointerOverElement = null;
}
- private void SetPointerOver(IPointerDevice device, IInputElement element, Point p)
+ private IInputElement SetPointerOver(IPointerDevice device, IInputRoot root, Point p)
{
- IEnumerable hits = element.GetInputElementsAt(p);
+ var elements = root.GetInputElementsAt(p).ToList();
+ return SetPointerOver(device, root, elements);
+ }
- foreach (var control in this.pointerOvers.Except(hits).ToList())
+ private IInputElement SetPointerOver(IPointerDevice device, IInputRoot root, IList elements)
+ {
+ foreach (var control in _pointerOvers.Except(elements).ToList())
{
PointerEventArgs e = new PointerEventArgs
{
@@ -257,11 +244,11 @@ namespace Perspex.Input
Source = control,
};
- this.pointerOvers.Remove(control);
+ _pointerOvers.Remove(control);
control.RaiseEvent(e);
}
- foreach (var control in hits.Except(this.pointerOvers))
+ foreach (var control in elements.Except(_pointerOvers))
{
PointerEventArgs e = new PointerEventArgs
{
@@ -270,9 +257,12 @@ namespace Perspex.Input
Source = control,
};
- this.pointerOvers.Add(control);
+ _pointerOvers.Add(control);
control.RaiseEvent(e);
}
+
+ root.PointerOverElement = elements.FirstOrDefault() ?? root;
+ return root.PointerOverElement;
}
}
}
diff --git a/src/Perspex.Input/Navigation/DirectionalNavigation.cs b/src/Perspex.Input/Navigation/DirectionalNavigation.cs
index 43e4c76d03..3a3e1354b6 100644
--- a/src/Perspex.Input/Navigation/DirectionalNavigation.cs
+++ b/src/Perspex.Input/Navigation/DirectionalNavigation.cs
@@ -1,16 +1,13 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Perspex.VisualTree;
namespace Perspex.Input.Navigation
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using Perspex.VisualTree;
-
///
/// The implementation for default directional navigation.
///
diff --git a/src/Perspex.Input/Navigation/FocusExtensions.cs b/src/Perspex.Input/Navigation/FocusExtensions.cs
index 995f9e9b41..1d1db7d6c6 100644
--- a/src/Perspex.Input/Navigation/FocusExtensions.cs
+++ b/src/Perspex.Input/Navigation/FocusExtensions.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input.Navigation
{
diff --git a/src/Perspex.Input/Navigation/TabNavigation.cs b/src/Perspex.Input/Navigation/TabNavigation.cs
index 717c0245ac..97091fffde 100644
--- a/src/Perspex.Input/Navigation/TabNavigation.cs
+++ b/src/Perspex.Input/Navigation/TabNavigation.cs
@@ -1,16 +1,13 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Perspex.VisualTree;
namespace Perspex.Input.Navigation
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using Perspex.VisualTree;
-
///
/// The implementation for default tab navigation.
///
diff --git a/src/Perspex.Input/NavigationMethod.cs b/src/Perspex.Input/NavigationMethod.cs
index a4c2d75c83..071cd4217a 100644
--- a/src/Perspex.Input/NavigationMethod.cs
+++ b/src/Perspex.Input/NavigationMethod.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Input
{
diff --git a/src/Perspex.Input/Perspex.Input.csproj b/src/Perspex.Input/Perspex.Input.csproj
index cc8c4195f4..e9233cbf25 100644
--- a/src/Perspex.Input/Perspex.Input.csproj
+++ b/src/Perspex.Input/Perspex.Input.csproj
@@ -40,7 +40,7 @@
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -64,8 +64,10 @@
-
-
- ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- True
-
..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
@@ -128,14 +126,14 @@
..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
+ ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+
-
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -60,7 +60,6 @@
-
-
- ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- True
-
..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
@@ -86,14 +81,14 @@
..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
+ ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+
-
-
- {415e048e-4611-4815-9cf2-d774e29079ac}
- NGenerics
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -60,7 +56,6 @@
-
-
- ..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll
- True
-
-
- ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- True
-
..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
@@ -90,14 +77,17 @@
..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
+ ..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll
+
+
+ ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+
-
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -55,7 +55,6 @@
-
- ..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll
- True
-
-
- ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- True
-
..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
@@ -144,14 +140,17 @@
..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
+ ..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll
+
+
+ ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+
-
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -106,10 +106,6 @@
-
- ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- True
-
..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
@@ -122,14 +118,14 @@
..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
+ ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+
-
-
\ No newline at end of file
diff --git a/src/Windows/Perspex.Designer/PerspexDesigner.xaml b/src/Windows/Perspex.Designer/PerspexDesigner.xaml
new file mode 100644
index 0000000000..673b4ca52c
--- /dev/null
+++ b/src/Windows/Perspex.Designer/PerspexDesigner.xaml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
diff --git a/src/Windows/Perspex.Designer/PerspexDesigner.xaml.cs b/src/Windows/Perspex.Designer/PerspexDesigner.xaml.cs
new file mode 100644
index 0000000000..f5f45ef835
--- /dev/null
+++ b/src/Windows/Perspex.Designer/PerspexDesigner.xaml.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Forms.Integration;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Perspex.Designer.AppHost;
+using Perspex.Designer.Comm;
+using Perspex.Designer.Metadata;
+
+namespace Perspex.Designer
+{
+ ///
+ /// Interaction logic for PerpexDesigner.xaml
+ ///
+ public partial class PerspexDesigner
+ {
+ public static readonly DependencyProperty TargetExeProperty = DependencyProperty.Register(
+ "TargetExe", typeof (string), typeof (PerspexDesigner), new FrameworkPropertyMetadata(TargetExeChanged));
+
+ private static void TargetExeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ ((PerspexDesigner) d).RestartProcess();
+ }
+ public string TargetExe
+ {
+ get { return (string) GetValue(TargetExeProperty); }
+ set { SetValue(TargetExeProperty, value); }
+ }
+
+ public static readonly DependencyProperty XamlProperty = DependencyProperty.Register(
+ "Xaml", typeof (string), typeof (PerspexDesigner), new FrameworkPropertyMetadata(XamlChanged));
+
+ private static void XamlChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ ((PerspexDesigner) d).OnXamlChanged();
+ }
+
+ public string Xaml
+ {
+ get { return (string) GetValue(XamlProperty); }
+ set { SetValue(XamlProperty, value); }
+ }
+
+ public PerspexDesignerMetadata Metadata { get; private set; }
+
+ private readonly ProcessHost _host = new ProcessHost();
+
+
+ public PerspexDesigner()
+ {
+ InitializeComponent();
+ BindingOperations.SetBinding(State, TextBox.TextProperty,
+ new Binding(nameof(ProcessHost.State)) {Source = _host, Mode = BindingMode.OneWay});
+
+ _host.PropertyChanged += _host_PropertyChanged;
+ _host.MetadataArrived += data => Metadata = data;
+ }
+
+ private void _host_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == nameof(ProcessHost.WindowHandle))
+ {
+ if (NativeContainer.Content != null)
+ {
+ var wndHost = ((HwndHost) NativeContainer.Content);
+ NativeContainer.Content = null;
+ wndHost?.Dispose();
+ }
+ if (_host.WindowHandle != IntPtr.Zero)
+ {
+ var host = new NativeWindowHost(_host.WindowHandle);
+ NativeContainer.Content = host;
+ }
+ }
+ }
+
+ class NativeWindowHost :HwndHost
+ {
+ private readonly IntPtr _hWnd;
+
+ public NativeWindowHost(IntPtr hWnd)
+ {
+ _hWnd = hWnd;
+ }
+
+ protected override HandleRef BuildWindowCore(HandleRef hwndParent)
+ {
+ WinApi.SetParent(_hWnd, hwndParent.Handle);
+ return new HandleRef(this, _hWnd);
+ }
+
+ protected override void DestroyWindowCore(HandleRef hwnd)
+ {
+ WinApi.SendMessage(hwnd.Handle, WinApi.WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+ }
+ }
+
+ public void KillProcess()
+ {
+ _host.Kill();
+ }
+
+ bool CheckTargetExeOrSetError()
+ {
+ if (string.IsNullOrEmpty(TargetExe))
+ {
+ State.Text = "No target exe found";
+ return false;
+ }
+
+ if (File.Exists(TargetExe ?? ""))
+ return true;
+ State.Text = "No target binary found, build your project";
+ return false;
+ }
+
+ public void RestartProcess()
+ {
+ KillProcess();
+ if(!CheckTargetExeOrSetError())
+ return;
+ if(string.IsNullOrEmpty(Xaml))
+ return;
+ _host.Start(TargetExe, Xaml);
+ }
+
+ private void OnXamlChanged()
+ {
+ if (!CheckTargetExeOrSetError())
+ return;
+ if (!_host.IsAlive)
+ _host.Start(TargetExe, Xaml);
+ else
+ _host.UpdateXaml(Xaml ?? "");
+ }
+
+ }
+}
diff --git a/src/Windows/Perspex.Designer/Program.cs b/src/Windows/Perspex.Designer/Program.cs
new file mode 100644
index 0000000000..6e58a3c98b
--- /dev/null
+++ b/src/Windows/Perspex.Designer/Program.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows.Threading;
+using Perspex.Designer.AppHost;
+using Perspex.Designer.Comm;
+
+namespace Perspex.Designer
+{
+ class Program
+ {
+ [STAThread]
+ static void Main(string[] args)
+ {
+ if (!args.Contains("--hosted"))
+ DemoMain(args);
+ else
+ HostedMain();
+
+
+ }
+
+ static void HostedMain()
+ {
+ //Initialize sync context
+ SynchronizationContext.SetSynchronizationContext(new WindowsFormsSynchronizationContext());
+ var comm = new CommChannel(Console.OpenStandardInput(), Console.OpenStandardOutput());
+ Console.SetOut(new NullTextWriter());
+ Console.SetError(new NullTextWriter());
+ comm.Disposed += () => Process.GetCurrentProcess().Kill();
+ comm.SendMessage(new StateMessage("Staying awhile and listening..."));
+ var service = new PerspexAppHost(comm);
+ service.Start();
+ Application.Run();
+ }
+
+ class NullTextWriter : TextWriter
+ {
+ public override Encoding Encoding => Encoding.UTF8;
+ public override void Write(char[] buffer, int index, int count)
+ {
+ }
+
+ public override void Write(char value)
+ {
+ }
+ }
+
+ private static void DemoMain(string[] args)
+ {
+ SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());
+ var app = new App();
+ const string targetExe = "--exe=";
+ const string xaml = "--xaml=";
+
+ app.Run(new DemoWindow(
+ args.Where(a => a.StartsWith(targetExe)).Select(a => a.Substring(targetExe.Length)).FirstOrDefault(),
+ args.Where(a => a.StartsWith(xaml)).Select(a => a.Substring(xaml.Length)).FirstOrDefault()));
+ }
+ }
+}
diff --git a/src/Windows/Perspex.Designer/Properties/AssemblyInfo.cs b/src/Windows/Perspex.Designer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..8a85c81a30
--- /dev/null
+++ b/src/Windows/Perspex.Designer/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Perspex.Designer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Perspex.Designer")]
+[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ec42600f-049b-43ff-aed1-8314d61b2749")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Windows/Perspex.Designer/README.txt b/src/Windows/Perspex.Designer/README.txt
new file mode 100644
index 0000000000..1dec6c88b0
--- /dev/null
+++ b/src/Windows/Perspex.Designer/README.txt
@@ -0,0 +1,3 @@
+To load data from XamlTestApplication run with:
+
+--exe=..\..\..\..\..\samples\XamlTestApplication\bin\Debug\XamlTestApplication.exe --xaml=..\..\..\..\..\samples\XamlTestApplication\Views\MainWindow.xaml
\ No newline at end of file
diff --git a/src/Windows/Perspex.Designer/WinApi.cs b/src/Windows/Perspex.Designer/WinApi.cs
new file mode 100644
index 0000000000..c751254945
--- /dev/null
+++ b/src/Windows/Perspex.Designer/WinApi.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Perspex.Designer
+{
+ class WinApi
+ {
+ [DllImport("user32.dll", SetLastError = true)]
+ public static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
+ [DllImport("user32.dll")]
+ public static extern bool SetParent(IntPtr hWnd, IntPtr hWndNewParent);
+ [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ public static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+ public const uint WM_CLOSE = 0x0010;
+
+ [DllImport("user32.dll", SetLastError = true)]
+ public static extern bool GetWindowRect(IntPtr hwnd, out RECT lpRect);
+
+ [StructLayout(LayoutKind.Sequential)]
+ public struct RECT
+ {
+ public int Left; // x position of upper-left corner
+ public int Top; // y position of upper-left corner
+ public int Right; // x position of lower-right corner
+ public int Bottom; // y position of lower-right corner
+ }
+ }
+}
diff --git a/src/Windows/Perspex.Designer/packages.config b/src/Windows/Perspex.Designer/packages.config
new file mode 100644
index 0000000000..5796357235
--- /dev/null
+++ b/src/Windows/Perspex.Designer/packages.config
@@ -0,0 +1,4 @@
+
+
+
\ No newline at end of file
diff --git a/src/Windows/Perspex.Designer/perspex.designer.snk b/src/Windows/Perspex.Designer/perspex.designer.snk
new file mode 100644
index 0000000000..68df1b6e88
Binary files /dev/null and b/src/Windows/Perspex.Designer/perspex.designer.snk differ
diff --git a/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs b/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
index 8a385d9ed7..31b0ff34a1 100644
--- a/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
@@ -1,40 +1,37 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.IO;
+using Perspex.Direct2D1.Media;
+using Perspex.Media;
+using Perspex.Platform;
+using Splat;
namespace Perspex.Direct2D1
{
- using System;
- using Perspex.Direct2D1.Media;
- using Perspex.Media;
- using Perspex.Platform;
- using Perspex.Threading;
- using Splat;
-
public class Direct2D1Platform : IPlatformRenderInterface
{
- private static Direct2D1Platform instance = new Direct2D1Platform();
+ private static readonly Direct2D1Platform s_instance = new Direct2D1Platform();
- private static SharpDX.Direct2D1.Factory d2d1Factory = new SharpDX.Direct2D1.Factory();
+ private static readonly SharpDX.Direct2D1.Factory s_d2D1Factory = new SharpDX.Direct2D1.Factory();
- private static SharpDX.DirectWrite.Factory dwfactory = new SharpDX.DirectWrite.Factory();
+ private static readonly SharpDX.DirectWrite.Factory s_dwfactory = new SharpDX.DirectWrite.Factory();
- private static SharpDX.WIC.ImagingFactory imagingFactory = new SharpDX.WIC.ImagingFactory();
+ private static readonly SharpDX.WIC.ImagingFactory s_imagingFactory = new SharpDX.WIC.ImagingFactory();
public static void Initialize()
{
var locator = Locator.CurrentMutable;
- locator.Register(() => instance, typeof(IPlatformRenderInterface));
- locator.Register(() => d2d1Factory, typeof(SharpDX.Direct2D1.Factory));
- locator.Register(() => dwfactory, typeof(SharpDX.DirectWrite.Factory));
- locator.Register(() => imagingFactory, typeof(SharpDX.WIC.ImagingFactory));
+ locator.Register(() => s_instance, typeof(IPlatformRenderInterface));
+ locator.Register(() => s_d2D1Factory, typeof(SharpDX.Direct2D1.Factory));
+ locator.Register(() => s_dwfactory, typeof(SharpDX.DirectWrite.Factory));
+ locator.Register(() => s_imagingFactory, typeof(SharpDX.WIC.ImagingFactory));
}
public IBitmapImpl CreateBitmap(int width, int height)
{
- return new BitmapImpl(imagingFactory, width, height);
+ return new BitmapImpl(s_imagingFactory, width, height);
}
public IFormattedTextImpl CreateFormattedText(
@@ -64,7 +61,7 @@ namespace Perspex.Direct2D1
public IRenderTargetBitmapImpl CreateRenderTargetBitmap(int width, int height)
{
- return new RenderTargetBitmapImpl(imagingFactory, d2d1Factory, width, height);
+ return new RenderTargetBitmapImpl(s_imagingFactory, s_d2D1Factory, width, height);
}
public IStreamGeometryImpl CreateStreamGeometry()
@@ -74,7 +71,12 @@ namespace Perspex.Direct2D1
public IBitmapImpl LoadBitmap(string fileName)
{
- return new BitmapImpl(imagingFactory, fileName);
+ return new BitmapImpl(s_imagingFactory, fileName);
+ }
+
+ public IBitmapImpl LoadBitmap(Stream stream)
+ {
+ return new BitmapImpl(s_imagingFactory, stream);
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Disposable.cs b/src/Windows/Perspex.Direct2D1/Disposable.cs
index f42a044686..a7a12ebb9c 100644
--- a/src/Windows/Perspex.Direct2D1/Disposable.cs
+++ b/src/Windows/Perspex.Direct2D1/Disposable.cs
@@ -1,26 +1,23 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Direct2D1
{
- using System;
-
public class Disposable : IDisposable where T : IDisposable
{
- private IDisposable extra;
+ private readonly IDisposable _extra;
public Disposable(T inner)
{
- this.Inner = inner;
+ Inner = inner;
}
public Disposable(T inner, IDisposable extra)
{
- this.Inner = inner;
- this.extra = extra;
+ Inner = inner;
+ _extra = extra;
}
public T Inner { get; }
@@ -32,8 +29,8 @@ namespace Perspex.Direct2D1
public void Dispose()
{
- this.Inner.Dispose();
- this.extra?.Dispose();
+ Inner.Dispose();
+ _extra?.Dispose();
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/GlobalSuppressions.cs b/src/Windows/Perspex.Direct2D1/GlobalSuppressions.cs
deleted file mode 100644
index 3d080850f1..0000000000
--- a/src/Windows/Perspex.Direct2D1/GlobalSuppressions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(
- "StyleCop.CSharp.MaintainabilityRules",
- "SA1401:Fields must be private",
- Justification = "PerspexProperty fields should not be private.")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(
- "StyleCop.CSharp.DocumentationRules",
- "SA1609:Property documentation must have value",
- Justification = "This rule is fscking pointless")]
\ No newline at end of file
diff --git a/src/Windows/Perspex.Direct2D1/Media/BrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/BrushImpl.cs
index 2f90c92e05..2008849a36 100644
--- a/src/Windows/Perspex.Direct2D1/Media/BrushImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/BrushImpl.cs
@@ -1,22 +1,19 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
namespace Perspex.Direct2D1.Media
{
- using System;
-
public abstract class BrushImpl : IDisposable
{
public SharpDX.Direct2D1.Brush PlatformBrush { get; set; }
public virtual void Dispose()
{
- if (this.PlatformBrush != null)
+ if (PlatformBrush != null)
{
- this.PlatformBrush.Dispose();
+ PlatformBrush.Dispose();
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/BrushWrapper.cs b/src/Windows/Perspex.Direct2D1/Media/BrushWrapper.cs
index 1ebe53606a..0c8f8d1373 100644
--- a/src/Windows/Perspex.Direct2D1/Media/BrushWrapper.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/BrushWrapper.cs
@@ -1,19 +1,16 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Media;
+using SharpDX;
namespace Perspex.Direct2D1.Media
{
- using Perspex.Media;
- using SharpDX;
-
internal class BrushWrapper : ComObject
{
public BrushWrapper(Brush brush)
{
- this.Brush = brush;
+ Brush = brush;
}
public Brush Brush { get; private set; }
diff --git a/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs b/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
index 22c79d0f72..58d884b18c 100644
--- a/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
@@ -1,19 +1,15 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Reactive.Disposables;
+using Perspex.Media;
+using SharpDX;
+using SharpDX.Direct2D1;
+using IBitmap = Perspex.Media.Imaging.IBitmap;
namespace Perspex.Direct2D1.Media
{
- using System;
- using System.Reactive.Disposables;
- using Perspex.Media;
- using SharpDX;
- using SharpDX.Direct2D1;
- using IBitmap = Perspex.Media.Imaging.IBitmap;
- using Matrix = Perspex.Matrix;
-
///
/// Draws using Direct2D1.
///
@@ -22,12 +18,12 @@ namespace Perspex.Direct2D1.Media
///
/// The Direct2D1 render target.
///
- private RenderTarget renderTarget;
+ private readonly RenderTarget _renderTarget;
///
/// The DirectWrite factory.
///
- private SharpDX.DirectWrite.Factory directWriteFactory;
+ private SharpDX.DirectWrite.Factory _directWriteFactory;
///
/// Initializes a new instance of the
@@ -48,8 +44,8 @@ namespace Perspex.Direct2D1.Media
///
public Matrix CurrentTransform
{
- get { return this.renderTarget.Transform.ToPerspex(); }
- private set { this.renderTarget.Transform = value.ToDirect2D(); }
+ get { return _renderTarget.Transform.ToPerspex(); }
+ private set { _renderTarget.Transform = value.ToDirect2D(); }
}
///
@@ -57,7 +53,7 @@ namespace Perspex.Direct2D1.Media
///
public void Dispose()
{
- this.renderTarget.EndDraw();
+ _renderTarget.EndDraw();
}
///
@@ -70,8 +66,8 @@ namespace Perspex.Direct2D1.Media
public void DrawImage(IBitmap source, double opacity, Rect sourceRect, Rect destRect)
{
BitmapImpl impl = (BitmapImpl)source.PlatformImpl;
- Bitmap d2d = impl.GetDirect2DBitmap(this.renderTarget);
- this.renderTarget.DrawBitmap(
+ Bitmap d2d = impl.GetDirect2DBitmap(_renderTarget);
+ _renderTarget.DrawBitmap(
d2d,
destRect.ToSharpDX(),
(float)opacity,
@@ -85,21 +81,24 @@ namespace Perspex.Direct2D1.Media
/// A disposable used to undo the clip rectangle.
public IDisposable PushClip(Rect clip)
{
- this.renderTarget.PushAxisAlignedClip(clip.ToSharpDX(), AntialiasMode.PerPrimitive);
+ _renderTarget.PushAxisAlignedClip(clip.ToSharpDX(), AntialiasMode.PerPrimitive);
return Disposable.Create(() =>
{
- this.renderTarget.PopAxisAlignedClip();
+ _renderTarget.PopAxisAlignedClip();
});
}
@@ -245,13 +259,14 @@ namespace Perspex.Direct2D1.Media
Opacity = (float)opacity,
};
- var layer = new Layer(this.renderTarget);
+ var layer = new Layer(_renderTarget);
- this.renderTarget.PushLayer(ref parameters, layer);
+ _renderTarget.PushLayer(ref parameters, layer);
return Disposable.Create(() =>
{
- this.renderTarget.PopLayer();
+ _renderTarget.PopLayer();
+ layer.Dispose();
});
}
else
@@ -268,13 +283,13 @@ namespace Perspex.Direct2D1.Media
public IDisposable PushTransform(Matrix matrix)
{
Matrix3x2 m3x2 = matrix.ToDirect2D();
- Matrix3x2 transform = this.renderTarget.Transform * m3x2;
- this.renderTarget.Transform = transform;
+ Matrix3x2 transform = _renderTarget.Transform * m3x2;
+ _renderTarget.Transform = transform;
return Disposable.Create(() =>
{
m3x2.Invert();
- this.renderTarget.Transform = transform * m3x2;
+ _renderTarget.Transform = transform * m3x2;
});
}
@@ -288,23 +303,33 @@ namespace Perspex.Direct2D1.Media
{
var solidColorBrush = brush as Perspex.Media.SolidColorBrush;
var linearGradientBrush = brush as Perspex.Media.LinearGradientBrush;
- var visualBrush = brush as Perspex.Media.VisualBrush;
+ var radialGradientBrush = brush as Perspex.Media.RadialGradientBrush;
+ var imageBrush = brush as ImageBrush;
+ var visualBrush = brush as VisualBrush;
if (solidColorBrush != null)
{
- return new SolidColorBrushImpl(solidColorBrush, this.renderTarget);
+ return new SolidColorBrushImpl(solidColorBrush, _renderTarget);
}
else if (linearGradientBrush != null)
{
- return new LinearGradientBrushImpl(linearGradientBrush, this.renderTarget, destinationSize);
+ return new LinearGradientBrushImpl(linearGradientBrush, _renderTarget, destinationSize);
+ }
+ else if (radialGradientBrush != null)
+ {
+ return new RadialGradientBrushImpl(radialGradientBrush, _renderTarget, destinationSize);
+ }
+ else if (imageBrush != null)
+ {
+ return new ImageBrushImpl(imageBrush, _renderTarget, destinationSize);
}
else if (visualBrush != null)
{
- return new VisualBrushImpl(visualBrush, this.renderTarget, destinationSize);
+ return new VisualBrushImpl(visualBrush, _renderTarget, destinationSize);
}
else
{
- return new SolidColorBrushImpl(null, this.renderTarget);
+ return new SolidColorBrushImpl(null, _renderTarget);
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs b/src/Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs
index 93aedf23e6..dd40e507b5 100644
--- a/src/Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs
@@ -1,19 +1,16 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Perspex.Media;
+using Perspex.Platform;
+using Splat;
+using DWrite = SharpDX.DirectWrite;
namespace Perspex.Direct2D1.Media
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using Perspex.Media;
- using Perspex.Platform;
- using Splat;
- using DWrite = SharpDX.DirectWrite;
-
public class FormattedTextImpl : IFormattedTextImpl
{
public FormattedTextImpl(
@@ -33,44 +30,42 @@ namespace Perspex.Direct2D1.Media
(DWrite.FontStyle)fontStyle,
(float)fontSize);
- this.TextLayout = new DWrite.TextLayout(
+ TextLayout = new DWrite.TextLayout(
factory,
text ?? string.Empty,
format,
float.MaxValue,
float.MaxValue);
- this.TextLayout.TextAlignment = textAlignment.ToDirect2D();
+ TextLayout.TextAlignment = textAlignment.ToDirect2D();
}
public Size Constraint
{
get
{
- return new Size(this.TextLayout.MaxWidth, this.TextLayout.MaxHeight);
+ return new Size(TextLayout.MaxWidth, TextLayout.MaxHeight);
}
set
{
- this.TextLayout.MaxWidth = (float)value.Width;
- this.TextLayout.MaxHeight = (float)value.Height;
+ TextLayout.MaxWidth = (float)value.Width;
+ TextLayout.MaxHeight = (float)value.Height;
}
}
public DWrite.TextLayout TextLayout
{
- get;
- private set;
- }
+ get; }
public void Dispose()
{
- this.TextLayout.Dispose();
+ TextLayout.Dispose();
}
public IEnumerable GetLines()
{
- var result = this.TextLayout.GetLineMetrics();
+ var result = TextLayout.GetLineMetrics();
return from line in result select new FormattedTextLine(line.Length, line.Height);
}
@@ -79,7 +74,7 @@ namespace Perspex.Direct2D1.Media
SharpDX.Bool isTrailingHit;
SharpDX.Bool isInside;
- var result = this.TextLayout.HitTestPoint(
+ var result = TextLayout.HitTestPoint(
(float)point.X,
(float)point.Y,
out isTrailingHit,
@@ -98,7 +93,7 @@ namespace Perspex.Direct2D1.Media
float x;
float y;
- var result = this.TextLayout.HitTestTextPosition(
+ var result = TextLayout.HitTestTextPosition(
index,
false,
out x,
@@ -109,13 +104,13 @@ namespace Perspex.Direct2D1.Media
public IEnumerable HitTestTextRange(int index, int length)
{
- var result = this.TextLayout.HitTestTextRange(index, length, 0, 0);
+ var result = TextLayout.HitTestTextRange(index, length, 0, 0);
return result.Select(x => new Rect(x.Left, x.Top, x.Width, x.Height));
}
public Size Measure()
{
- var metrics = this.TextLayout.Metrics;
+ var metrics = TextLayout.Metrics;
var width = metrics.WidthIncludingTrailingWhitespace;
if (float.IsNaN(width))
@@ -123,12 +118,12 @@ namespace Perspex.Direct2D1.Media
width = metrics.Width;
}
- return new Size(width, this.TextLayout.Metrics.Height);
+ return new Size(width, TextLayout.Metrics.Height);
}
public void SetForegroundBrush(Brush brush, int startIndex, int count)
{
- this.TextLayout.SetDrawingEffect(
+ TextLayout.SetDrawingEffect(
new BrushWrapper(brush),
new DWrite.TextRange(startIndex, count));
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
index 0cd3952579..2d1665b27b 100644
--- a/src/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
@@ -1,21 +1,18 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Platform;
+using SharpDX.Direct2D1;
+using Splat;
namespace Perspex.Direct2D1.Media
{
- using Perspex.Platform;
- using SharpDX.Direct2D1;
- using Splat;
-
///
/// The platform-specific interface for
public abstract class GeometryImpl : IGeometryImpl
{
- private TransformedGeometry transformed;
+ private TransformedGeometry _transformed;
///
/// Gets the geometry's bounding rectangle.
@@ -36,10 +33,7 @@ namespace Perspex.Direct2D1.Media
///
/// Gets the Direct2D
- public Geometry Geometry
- {
- get { return this.transformed ?? this.DefiningGeometry; }
- }
+ public Geometry Geometry => _transformed ?? DefiningGeometry;
///
/// Gets or sets the transform for the geometry.
@@ -48,27 +42,27 @@ namespace Perspex.Direct2D1.Media
{
get
{
- return this.transformed != null ?
- this.transformed.Transform.ToPerspex() :
+ return _transformed != null ?
+ _transformed.Transform.ToPerspex() :
Matrix.Identity;
}
set
{
- if (value != this.Transform)
+ if (value != Transform)
{
- if (this.transformed != null)
+ if (_transformed != null)
{
- this.transformed.Dispose();
- this.transformed = null;
+ _transformed.Dispose();
+ _transformed = null;
}
if (!value.IsIdentity)
{
Factory factory = Locator.Current.GetService();
- this.transformed = new TransformedGeometry(
+ _transformed = new TransformedGeometry(
factory,
- this.DefiningGeometry,
+ DefiningGeometry,
value.ToDirect2D());
}
}
@@ -82,13 +76,13 @@ namespace Perspex.Direct2D1.Media
/// The bounding rectangle.
public Rect GetRenderBounds(double strokeThickness)
{
- if (this.transformed != null)
+ if (_transformed != null)
{
- return this.transformed.GetWidenedBounds((float)strokeThickness).ToPerspex();
+ return _transformed.GetWidenedBounds((float)strokeThickness).ToPerspex();
}
else
{
- return this.DefiningGeometry.GetWidenedBounds((float)strokeThickness).ToPerspex();
+ return DefiningGeometry.GetWidenedBounds((float)strokeThickness).ToPerspex();
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/ImageBrushImpl.cs
new file mode 100644
index 0000000000..bbadb758c4
--- /dev/null
+++ b/src/Windows/Perspex.Direct2D1/Media/ImageBrushImpl.cs
@@ -0,0 +1,94 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Media;
+using SharpDX.Direct2D1;
+
+namespace Perspex.Direct2D1.Media
+{
+ public class ImageBrushImpl : TileBrushImpl
+ {
+ public ImageBrushImpl(
+ ImageBrush brush,
+ RenderTarget target,
+ Size targetSize)
+ {
+ if (brush.Source == null)
+ {
+ return;
+ }
+
+ var image = ((BitmapImpl)brush.Source.PlatformImpl).GetDirect2DBitmap(target);
+ var imageSize = new Size(brush.Source.PixelWidth, brush.Source.PixelHeight);
+ var tileMode = brush.TileMode;
+ var sourceRect = brush.SourceRect.ToPixels(imageSize);
+ var destinationRect = brush.DestinationRect.ToPixels(targetSize);
+ var scale = brush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
+ var translate = CalculateTranslate(brush, sourceRect, destinationRect, scale);
+ var intermediateSize = CalculateIntermediateSize(tileMode, targetSize, destinationRect.Size);
+ var brtOpts = CompatibleRenderTargetOptions.None;
+
+ // TODO: There are times where we don't need to draw an intermediate bitmap. Identify
+ // them and directly use 'image' in those cases.
+ using (var intermediate = new BitmapRenderTarget(target, brtOpts, intermediateSize))
+ {
+ Rect drawRect;
+ var transform = CalculateIntermediateTransform(
+ tileMode,
+ sourceRect,
+ destinationRect,
+ scale,
+ translate,
+ out drawRect);
+
+ intermediate.BeginDraw();
+ intermediate.PushAxisAlignedClip(drawRect.ToDirect2D(), AntialiasMode.Aliased);
+ intermediate.Transform = transform.ToDirect2D();
+ intermediate.DrawBitmap(image, 1, BitmapInterpolationMode.Linear);
+ intermediate.PopAxisAlignedClip();
+ intermediate.EndDraw();
+
+ this.PlatformBrush = new BitmapBrush(
+ target,
+ intermediate.Bitmap,
+ GetBitmapBrushProperties(brush),
+ GetBrushProperties(brush, destinationRect));
+ }
+ }
+
+ private BitmapBrush CreateDirectBrush(
+ ImageBrush brush,
+ RenderTarget target,
+ Bitmap image,
+ Rect sourceRect,
+ Rect destinationRect)
+ {
+ var tileMode = brush.TileMode;
+ var scale = brush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
+ var translate = CalculateTranslate(brush, sourceRect, destinationRect, scale);
+ var transform = Matrix.CreateTranslation(-sourceRect.Position) *
+ Matrix.CreateScale(scale) *
+ Matrix.CreateTranslation(translate);
+
+ var opts = new BrushProperties
+ {
+ Transform = transform.ToDirect2D(),
+ Opacity = (float)brush.Opacity,
+ };
+
+ var bitmapOpts = new BitmapBrushProperties
+ {
+ ExtendModeX = GetExtendModeX(tileMode),
+ ExtendModeY = GetExtendModeY(tileMode),
+ };
+
+ return new BitmapBrush(target, image, bitmapOpts, opts);
+ }
+
+ private BitmapBrush CreateIndirectBrush()
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
index 40518a553a..4572c09850 100644
--- a/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -1,24 +1,21 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.IO;
+using Perspex.Platform;
+using SharpDX.WIC;
namespace Perspex.Direct2D1.Media
{
- using System;
- using System.IO;
- using Perspex.Platform;
- using SharpDX.WIC;
-
///
/// A Direct2D implementation of a
public class BitmapImpl : IBitmapImpl
{
- private ImagingFactory factory;
+ private readonly ImagingFactory _factory;
- private SharpDX.Direct2D1.Bitmap direct2D;
+ private SharpDX.Direct2D1.Bitmap _direct2D;
///
/// Initializes a new instance of the
+ /// Initializes a new instance of the
+ ///
/// Gets the width of the bitmap, in pixels.
///
- public int PixelWidth
- {
- get { return this.WicImpl.Size.Height; }
- }
+ public int PixelWidth => WicImpl.Size.Height;
///
/// Gets the height of the bitmap, in pixels.
///
- public int PixelHeight
- {
- get { return this.WicImpl.Size.Width; }
- }
+ public int PixelHeight => WicImpl.Size.Width;
///
/// Gets the WIC implementation of the bitmap.
///
public Bitmap WicImpl
{
- get;
- private set;
- }
+ get; }
///
/// Gets a Direct2D bitmap to use on the specified render target.
@@ -84,14 +88,14 @@ namespace Perspex.Direct2D1.Media
/// The Direct2D bitmap.
public SharpDX.Direct2D1.Bitmap GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget renderTarget)
{
- if (this.direct2D == null)
+ if (_direct2D == null)
{
- FormatConverter converter = new FormatConverter(this.factory);
- converter.Initialize(this.WicImpl, PixelFormat.Format32bppPBGRA);
- this.direct2D = SharpDX.Direct2D1.Bitmap.FromWicBitmap(renderTarget, converter);
+ FormatConverter converter = new FormatConverter(_factory);
+ converter.Initialize(WicImpl, PixelFormat.Format32bppPBGRA);
+ _direct2D = SharpDX.Direct2D1.Bitmap.FromWicBitmap(renderTarget, converter);
}
- return this.direct2D;
+ return _direct2D;
}
///
@@ -108,12 +112,12 @@ namespace Perspex.Direct2D1.Media
using (FileStream s = new FileStream(fileName, FileMode.Create))
{
- PngBitmapEncoder encoder = new PngBitmapEncoder(this.factory);
+ PngBitmapEncoder encoder = new PngBitmapEncoder(_factory);
encoder.Initialize(s);
BitmapFrameEncode frame = new BitmapFrameEncode(encoder);
frame.Initialize();
- frame.WriteSource(this.WicImpl);
+ frame.WriteSource(WicImpl);
frame.Commit();
encoder.Commit();
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
index f72c840b9b..51f7a71cca 100644
--- a/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
@@ -1,19 +1,16 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Platform;
+using SharpDX.Direct2D1;
+using SharpDX.WIC;
namespace Perspex.Direct2D1.Media
{
- using System;
- using Perspex.Platform;
- using SharpDX.Direct2D1;
- using SharpDX.WIC;
-
public class RenderTargetBitmapImpl : BitmapImpl, IRenderTargetBitmapImpl, IDisposable
{
- private WicRenderTarget target;
+ private readonly WicRenderTarget _target;
public RenderTargetBitmapImpl(
ImagingFactory imagingFactory,
@@ -28,9 +25,9 @@ namespace Perspex.Direct2D1.Media
DpiY = 96,
};
- this.target = new WicRenderTarget(
+ _target = new WicRenderTarget(
d2dFactory,
- this.WicImpl,
+ WicImpl,
props);
}
@@ -41,7 +38,7 @@ namespace Perspex.Direct2D1.Media
public void Render(IVisual visual)
{
- Renderer renderer = new Renderer(this.target);
+ Renderer renderer = new Renderer(_target);
renderer.Render(visual, null);
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs
index de6521446e..b67378990c 100644
--- a/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs
@@ -1,45 +1,32 @@
-namespace Perspex.Direct2D1.Media
-{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Text;
- using System.Threading.Tasks;
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Perspex.Direct2D1.Media
+{
public class LinearGradientBrushImpl : BrushImpl
{
public LinearGradientBrushImpl(
- Perspex.Media.LinearGradientBrush brush,
- SharpDX.Direct2D1.RenderTarget target,
+ Perspex.Media.LinearGradientBrush brush,
+ SharpDX.Direct2D1.RenderTarget target,
Size destinationSize)
{
- if (brush != null)
- {
- var gradientStops = brush.GradientStops.Select(s => new SharpDX.Direct2D1.GradientStop { Color = s.Color.ToDirect2D(), Position = (float)s.Offset }).ToArray();
-
- Point startPoint = new Point(0, 0);
- Point endPoint = new Point(0, 0);
-
- switch (brush.MappingMode)
- {
- case Perspex.Media.BrushMappingMode.Absolute:
- // TODO:
-
- break;
- case Perspex.Media.BrushMappingMode.RelativeToBoundingBox:
- startPoint = new Point(brush.StartPoint.X * destinationSize.Width, brush.StartPoint.Y * destinationSize.Height);
- endPoint = new Point(brush.EndPoint.X * destinationSize.Width, brush.EndPoint.Y * destinationSize.Height);
+ var gradientStops = brush.GradientStops.Select(s => new SharpDX.Direct2D1.GradientStop { Color = s.Color.ToDirect2D(), Position = (float)s.Offset }).ToArray();
- break;
- }
+ Point startPoint = brush.StartPoint.ToPixels(destinationSize);
+ Point endPoint = brush.EndPoint.ToPixels(destinationSize);
- this.PlatformBrush = new SharpDX.Direct2D1.LinearGradientBrush(
- target,
- new SharpDX.Direct2D1.LinearGradientBrushProperties { StartPoint = startPoint.ToSharpDX(), EndPoint = endPoint.ToSharpDX() },
- new SharpDX.Direct2D1.BrushProperties { Opacity = (float)brush.Opacity, Transform = target.Transform },
- new SharpDX.Direct2D1.GradientStopCollection(target, gradientStops, brush.SpreadMethod.ToDirect2D())
- );
- }
+ PlatformBrush = new SharpDX.Direct2D1.LinearGradientBrush(
+ target,
+ new SharpDX.Direct2D1.LinearGradientBrushProperties { StartPoint = startPoint.ToSharpDX(), EndPoint = endPoint.ToSharpDX() },
+ new SharpDX.Direct2D1.BrushProperties { Opacity = (float)brush.Opacity, Transform = target.Transform },
+ new SharpDX.Direct2D1.GradientStopCollection(target, gradientStops, brush.SpreadMethod.ToDirect2D())
+ );
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs b/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs
index 264b5d45c0..dbd56cfa4d 100644
--- a/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs
@@ -1,32 +1,29 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using SharpDX;
+using SharpDX.Direct2D1;
+using SharpDX.DirectWrite;
namespace Perspex.Direct2D1.Media
{
- using System;
- using SharpDX;
- using SharpDX.Direct2D1;
- using SharpDX.DirectWrite;
-
internal class PerspexTextRenderer : TextRenderer
{
- private DrawingContext context;
+ private readonly DrawingContext _context;
- private RenderTarget renderTarget;
+ private readonly RenderTarget _renderTarget;
- private Brush foreground;
+ private readonly Brush _foreground;
public PerspexTextRenderer(
DrawingContext context,
RenderTarget target,
Brush foreground)
{
- this.context = context;
- this.renderTarget = target;
- this.foreground = foreground;
+ _context = context;
+ _renderTarget = target;
+ _foreground = foreground;
}
public IDisposable Shadow
@@ -52,10 +49,10 @@ namespace Perspex.Direct2D1.Media
// TODO: Work out how to get the size below rather than passing new Size().
var brush = (wrapper == null) ?
- this.foreground :
- this.context.CreateBrush(wrapper.Brush, new Size()).PlatformBrush;
+ _foreground :
+ _context.CreateBrush(wrapper.Brush, new Size()).PlatformBrush;
- this.renderTarget.DrawGlyphRun(
+ _renderTarget.DrawGlyphRun(
new Vector2(baselineOriginX, baselineOriginY),
glyphRun,
brush,
@@ -86,12 +83,12 @@ namespace Perspex.Direct2D1.Media
public Matrix3x2 GetCurrentTransform(object clientDrawingContext)
{
- return this.renderTarget.Transform;
+ return _renderTarget.Transform;
}
public float GetPixelsPerDip(object clientDrawingContext)
{
- return this.renderTarget.DotsPerInch.Width / 96;
+ return _renderTarget.DotsPerInch.Width / 96;
}
public bool IsPixelSnappingDisabled(object clientDrawingContext)
diff --git a/src/Windows/Perspex.Direct2D1/Media/RadialGradientBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/RadialGradientBrushImpl.cs
new file mode 100644
index 0000000000..f0b21c7ae7
--- /dev/null
+++ b/src/Windows/Perspex.Direct2D1/Media/RadialGradientBrushImpl.cs
@@ -0,0 +1,35 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Perspex.Direct2D1.Media
+{
+ public class RadialGradientBrushImpl : BrushImpl
+ {
+ public RadialGradientBrushImpl(
+ Perspex.Media.RadialGradientBrush brush,
+ SharpDX.Direct2D1.RenderTarget target,
+ Size destinationSize)
+ {
+ var gradientStops = brush.GradientStops.Select(s => new SharpDX.Direct2D1.GradientStop { Color = s.Color.ToDirect2D(), Position = (float)s.Offset }).ToArray();
+
+ Point centerPoint = brush.Center.ToPixels(destinationSize);
+ Point GradientOriginOffset = brush.GradientOrigin.ToPixels(destinationSize);
+ // Note: Direct2D supports RadiusX and RadiusY but Cairo backend supports only Radius property
+ double radiusX = brush.Radius;
+ double radiusY = brush.Radius;
+
+ PlatformBrush = new SharpDX.Direct2D1.RadialGradientBrush(
+ target,
+ new SharpDX.Direct2D1.RadialGradientBrushProperties { Center = centerPoint.ToSharpDX(), GradientOriginOffset = GradientOriginOffset.ToSharpDX(), RadiusX = (float)radiusX, RadiusY = (float)radiusY },
+ new SharpDX.Direct2D1.BrushProperties { Opacity = (float)brush.Opacity, Transform = target.Transform },
+ new SharpDX.Direct2D1.GradientStopCollection(target, gradientStops, brush.SpreadMethod.ToDirect2D())
+ );
+ }
+ }
+}
diff --git a/src/Windows/Perspex.Direct2D1/Media/SolidColorBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/SolidColorBrushImpl.cs
index 73093b2e0a..ce48231891 100644
--- a/src/Windows/Perspex.Direct2D1/Media/SolidColorBrushImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/SolidColorBrushImpl.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
namespace Perspex.Direct2D1.Media
{
@@ -10,7 +7,15 @@ namespace Perspex.Direct2D1.Media
{
public SolidColorBrushImpl(Perspex.Media.SolidColorBrush brush, SharpDX.Direct2D1.RenderTarget target)
{
- this.PlatformBrush = new SharpDX.Direct2D1.SolidColorBrush(target, brush?.Color.ToDirect2D() ?? new SharpDX.Color4());
+ PlatformBrush = new SharpDX.Direct2D1.SolidColorBrush(
+ target,
+ brush?.Color.ToDirect2D() ?? new SharpDX.Color4(),
+ new SharpDX.Direct2D1.BrushProperties
+ {
+ Opacity = brush != null ? (float)brush.Opacity : 1.0f,
+ Transform = target.Transform
+ }
+ );
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
index 15fb88d7d0..a8021cdb80 100644
--- a/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
@@ -1,21 +1,18 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Platform;
+using SharpDX.Direct2D1;
namespace Perspex.Direct2D1.Media
{
- using Perspex.Platform;
- using SharpDX.Direct2D1;
-
public class StreamGeometryContextImpl : IStreamGeometryContextImpl
{
- private GeometrySink sink;
+ private readonly GeometrySink _sink;
public StreamGeometryContextImpl(GeometrySink sink)
{
- this.sink = sink;
+ _sink = sink;
}
public void ArcTo(
@@ -25,7 +22,7 @@ namespace Perspex.Direct2D1.Media
bool isLargeArc,
Perspex.Media.SweepDirection sweepDirection)
{
- this.sink.AddArc(new ArcSegment
+ _sink.AddArc(new ArcSegment
{
Point = point.ToSharpDX(),
Size = size.ToSharpDX(),
@@ -37,12 +34,12 @@ namespace Perspex.Direct2D1.Media
public void BeginFigure(Point startPoint, bool isFilled)
{
- this.sink.BeginFigure(startPoint.ToSharpDX(), isFilled ? FigureBegin.Filled : FigureBegin.Hollow);
+ _sink.BeginFigure(startPoint.ToSharpDX(), isFilled ? FigureBegin.Filled : FigureBegin.Hollow);
}
public void BezierTo(Point point1, Point point2, Point point3)
{
- this.sink.AddBezier(new BezierSegment
+ _sink.AddBezier(new BezierSegment
{
Point1 = point1.ToSharpDX(),
Point2 = point2.ToSharpDX(),
@@ -52,18 +49,18 @@ namespace Perspex.Direct2D1.Media
public void LineTo(Point point)
{
- this.sink.AddLine(point.ToSharpDX());
+ _sink.AddLine(point.ToSharpDX());
}
public void EndFigure(bool isClosed)
{
- this.sink.EndFigure(isClosed ? FigureEnd.Closed : FigureEnd.Open);
+ _sink.EndFigure(isClosed ? FigureEnd.Closed : FigureEnd.Open);
}
public void Dispose()
{
- this.sink.Close();
- this.sink.Dispose();
+ _sink.Close();
+ _sink.Dispose();
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
index f446934df4..022a53f8c4 100644
--- a/src/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
@@ -1,23 +1,20 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Media;
+using Perspex.Platform;
+using SharpDX.Direct2D1;
+using Splat;
+using D2DGeometry = SharpDX.Direct2D1.Geometry;
namespace Perspex.Direct2D1.Media
{
- using Perspex.Media;
- using Perspex.Platform;
- using SharpDX.Direct2D1;
- using Splat;
- using D2DGeometry = SharpDX.Direct2D1.Geometry;
-
///
/// A Direct2D implementation of a
public class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
{
- private PathGeometry path;
+ private readonly PathGeometry _path;
///
/// Initializes a new instance of the ();
- this.path = new PathGeometry(factory);
+ _path = new PathGeometry(factory);
}
///
@@ -34,20 +31,14 @@ namespace Perspex.Direct2D1.Media
///
/// Clones the geometry.
@@ -58,7 +49,7 @@ namespace Perspex.Direct2D1.Media
Factory factory = Locator.Current.GetService();
var result = new PathGeometry(factory);
var sink = result.Open();
- this.path.Stream(sink);
+ _path.Stream(sink);
sink.Close();
return new StreamGeometryImpl(result);
}
@@ -71,7 +62,7 @@ namespace Perspex.Direct2D1.Media
///
public IStreamGeometryContextImpl Open()
{
- return new StreamGeometryContextImpl(this.path.Open());
+ return new StreamGeometryContextImpl(_path.Open());
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Media/TileBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/TileBrushImpl.cs
new file mode 100644
index 0000000000..fd9b938b2d
--- /dev/null
+++ b/src/Windows/Perspex.Direct2D1/Media/TileBrushImpl.cs
@@ -0,0 +1,135 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Layout;
+using Perspex.Media;
+using SharpDX;
+using SharpDX.Direct2D1;
+
+namespace Perspex.Direct2D1.Media
+{
+ public class TileBrushImpl : BrushImpl
+ {
+ ///
+ /// Calculates a translate based on a
+ /// A vector with the X and Y translate.
+ protected static Vector CalculateTranslate(
+ TileBrush brush,
+ Rect sourceRect,
+ Rect destinationRect,
+ Vector scale)
+ {
+ var x = 0.0;
+ var y = 0.0;
+ var size = sourceRect.Size * scale;
+
+ switch (brush.AlignmentX)
+ {
+ case AlignmentX.Center:
+ x += (destinationRect.Width - size.Width) / 2;
+ break;
+ case AlignmentX.Right:
+ x += destinationRect.Width - size.Width;
+ break;
+ }
+
+ switch (brush.AlignmentY)
+ {
+ case AlignmentY.Center:
+ y += (destinationRect.Height - size.Height) / 2;
+ break;
+ case AlignmentY.Bottom:
+ y += destinationRect.Height - size.Height;
+ break;
+ }
+
+ return new Vector(x, y);
+ }
+
+ protected static Size2F CalculateIntermediateSize(
+ TileMode tileMode,
+ Size targetSize,
+ Size destinationSize)
+ {
+ var result = tileMode == TileMode.None ? targetSize : destinationSize;
+ return result.ToSharpDX();
+ }
+
+ protected static Matrix CalculateIntermediateTransform(
+ TileMode tileMode,
+ Rect sourceRect,
+ Rect destinationRect,
+ Vector scale,
+ Vector translate,
+ out Rect drawRect)
+ {
+ var transform = Matrix.CreateTranslation(-sourceRect.Position) *
+ Matrix.CreateScale(scale) *
+ Matrix.CreateTranslation(translate);
+ Rect dr;
+
+ if (tileMode == TileMode.None)
+ {
+ dr = destinationRect;
+ transform *= Matrix.CreateTranslation(destinationRect.Position);
+ }
+ else
+ {
+ dr = new Rect(destinationRect.Size);
+ }
+
+ drawRect = dr;
+
+ return transform;
+ }
+
+ protected static BrushProperties GetBrushProperties(TileBrush brush, Rect destinationRect)
+ {
+ var tileMode = brush.TileMode;
+
+ return new BrushProperties
+ {
+ Opacity = (float)brush.Opacity,
+ Transform = brush.TileMode != TileMode.None ?
+ SharpDX.Matrix3x2.Translation(
+ (float)destinationRect.X,
+ (float)destinationRect.Y) :
+ SharpDX.Matrix3x2.Identity,
+ };
+ }
+
+ protected static BitmapBrushProperties GetBitmapBrushProperties(TileBrush brush)
+ {
+ var tileMode = brush.TileMode;
+
+ return new BitmapBrushProperties
+ {
+ ExtendModeX = GetExtendModeX(tileMode),
+ ExtendModeY = GetExtendModeY(tileMode),
+ };
+ }
+
+ protected static ExtendMode GetExtendModeX(TileMode tileMode)
+ {
+ return (tileMode & TileMode.FlipX) != 0 ? ExtendMode.Mirror : ExtendMode.Wrap;
+ }
+
+ protected static ExtendMode GetExtendModeY(TileMode tileMode)
+ {
+ return (tileMode & TileMode.FlipY) != 0 ? ExtendMode.Mirror : ExtendMode.Wrap;
+ }
+
+ public override void Dispose()
+ {
+ ((BitmapBrush)PlatformBrush)?.Bitmap.Dispose();
+ base.Dispose();
+ }
+ }
+}
diff --git a/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs
index 8638162ff5..bc049e7ca3 100644
--- a/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs
+++ b/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs
@@ -1,24 +1,27 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Layout;
+using Perspex.Media;
+using SharpDX.Direct2D1;
namespace Perspex.Direct2D1.Media
{
- using System;
- using Perspex.Layout;
- using Perspex.Media;
- using SharpDX.Direct2D1;
-
- public class VisualBrushImpl : BrushImpl
+ public class VisualBrushImpl : TileBrushImpl
{
public VisualBrushImpl(
- Perspex.Media.VisualBrush brush,
- SharpDX.Direct2D1.RenderTarget target,
+ VisualBrush brush,
+ RenderTarget target,
Size targetSize)
{
var visual = brush.Visual;
+
+ if (visual == null)
+ {
+ return;
+ }
+
var layoutable = visual as ILayoutable;
if (layoutable?.IsArrangeValid == false)
@@ -27,86 +30,78 @@ namespace Perspex.Direct2D1.Media
layoutable.Arrange(new Rect(layoutable.DesiredSize));
}
+ var tileMode = brush.TileMode;
var sourceRect = brush.SourceRect.ToPixels(layoutable.Bounds.Size);
var destinationRect = brush.DestinationRect.ToPixels(targetSize);
- var bitmapSize = brush.TileMode == TileMode.None ? targetSize : destinationRect.Size;
var scale = brush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
var translate = CalculateTranslate(brush, sourceRect, destinationRect, scale);
- var options = CompatibleRenderTargetOptions.None;
+ var intermediateSize = CalculateIntermediateSize(tileMode, targetSize, destinationRect.Size);
+ var brtOpts = CompatibleRenderTargetOptions.None;
- using (var brt = new BitmapRenderTarget(target, options, bitmapSize.ToSharpDX()))
+ // TODO: There are times where we don't need to draw an intermediate bitmap. Identify
+ // them and directly use 'image' in those cases.
+ using (var intermediate = new BitmapRenderTarget(target, brtOpts, intermediateSize))
{
- var renderer = new Renderer(brt);
- var transform = Matrix.CreateTranslation(-sourceRect.Position) *
- Matrix.CreateScale(scale) *
- Matrix.CreateTranslation(translate);
-
Rect drawRect;
-
- if (brush.TileMode == TileMode.None)
- {
- drawRect = destinationRect;
- transform *= Matrix.CreateTranslation(destinationRect.Position);
- }
- else
- {
- drawRect = new Rect(0, 0, destinationRect.Width, destinationRect.Height);
- }
+ var transform = CalculateIntermediateTransform(
+ tileMode,
+ sourceRect,
+ destinationRect,
+ scale,
+ translate,
+ out drawRect);
+ var renderer = new Renderer(intermediate);
renderer.Render(visual, null, transform, drawRect);
- var result = new BitmapBrush(brt, brt.Bitmap);
- result.ExtendModeX = (brush.TileMode & TileMode.FlipX) != 0 ? ExtendMode.Mirror : ExtendMode.Wrap;
- result.ExtendModeY = (brush.TileMode & TileMode.FlipY) != 0 ? ExtendMode.Mirror : ExtendMode.Wrap;
-
- if (brush.TileMode != TileMode.None)
- {
- result.Transform = SharpDX.Matrix3x2.Translation(
- (float)destinationRect.X,
- (float)destinationRect.Y);
- }
-
- this.PlatformBrush = result;
- }
- }
-
- private static Vector CalculateTranslate(
- VisualBrush brush,
- Rect sourceRect,
- Rect destinationRect,
- Vector scale)
- {
- var x = 0.0;
- var y = 0.0;
- var size = sourceRect.Size * scale;
-
- switch (brush.AlignmentX)
- {
- case AlignmentX.Center:
- x += (destinationRect.Width - size.Width) / 2;
- break;
- case AlignmentX.Right:
- x += destinationRect.Width - size.Width;
- break;
- }
-
- switch (brush.AlignmentY)
- {
- case AlignmentY.Center:
- y += (destinationRect.Height - size.Height) / 2;
- break;
- case AlignmentY.Bottom:
- y += destinationRect.Height - size.Height;
- break;
+ this.PlatformBrush = new BitmapBrush(
+ target,
+ intermediate.Bitmap,
+ GetBitmapBrushProperties(brush),
+ GetBrushProperties(brush, destinationRect));
}
- return new Vector(x, y);
- }
-
- public override void Dispose()
- {
- ((BitmapBrush)this.PlatformBrush).Bitmap.Dispose();
- base.Dispose();
+ //var sourceRect = brush.SourceRect.ToPixels(layoutable.Bounds.Size);
+ //var destinationRect = brush.DestinationRect.ToPixels(targetSize);
+ //var bitmapSize = brush.TileMode == TileMode.None ? targetSize : destinationRect.Size;
+ //var scale = brush.Stretch.CalculateScaling(destinationRect.Size, sourceRect.Size);
+ //var translate = CalculateTranslate(brush, sourceRect, destinationRect, scale);
+ //var options = CompatibleRenderTargetOptions.None;
+
+ //using (var brt = new BitmapRenderTarget(target, options, bitmapSize.ToSharpDX()))
+ //{
+ // var renderer = new Renderer(brt);
+ // var transform = Matrix.CreateTranslation(-sourceRect.Position) *
+ // Matrix.CreateScale(scale) *
+ // Matrix.CreateTranslation(translate);
+
+ // Rect drawRect;
+
+ // if (brush.TileMode == TileMode.None)
+ // {
+ // drawRect = destinationRect;
+ // transform *= Matrix.CreateTranslation(destinationRect.Position);
+ // }
+ // else
+ // {
+ // drawRect = new Rect(0, 0, destinationRect.Width, destinationRect.Height);
+ // }
+
+ // renderer.Render(visual, null, transform, drawRect);
+
+ // var result = new BitmapBrush(brt, brt.Bitmap);
+ // result.ExtendModeX = GetExtendModeX(brush.TileMode);
+ // result.ExtendModeY = GetExtendModeY(brush.TileMode);
+
+ // if (brush.TileMode != TileMode.None)
+ // {
+ // result.Transform = SharpDX.Matrix3x2.Translation(
+ // (float)destinationRect.X,
+ // (float)destinationRect.Y);
+ // }
+
+ // PlatformBrush = result;
+ //}
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
index c7271b74bd..9a981c3bf1 100644
--- a/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
+++ b/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
@@ -46,10 +46,6 @@
False
$(SharpDXPackageBinDir)\SharpDX.DXGI.dll
-
- ..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
..\..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll
+
+ ..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
+
@@ -75,14 +74,16 @@
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
@@ -107,7 +108,7 @@
Perspex.Base
- {42472427-4774-4c81-8aff-9f27b8e31721}
+ {42472427-4774-4C81-8AFF-9F27B8E31721}
Perspex.Layout
@@ -115,9 +116,6 @@
Perspex.SceneGraph
-
-
diff --git a/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
index abebb62a3c..2364521ed0 100644
--- a/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
@@ -1,17 +1,14 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Linq;
+using SharpDX;
+using SharpDX.Direct2D1;
+using DWrite = SharpDX.DirectWrite;
namespace Perspex.Direct2D1
{
- using System;
- using System.Linq;
- using SharpDX;
- using SharpDX.Direct2D1;
- using DWrite = SharpDX.DirectWrite;
-
public static class PrimitiveExtensions
{
public static Rect ToPerspex(this RectangleF r)
@@ -24,17 +21,17 @@ namespace Perspex.Direct2D1
return new RectangleF((float)r.X, (float)r.Y, (float)r.Width, (float)r.Height);
}
- public static Vector2 ToSharpDX(this Perspex.Point p)
+ public static Vector2 ToSharpDX(this Point p)
{
return new Vector2((float)p.X, (float)p.Y);
}
- public static Size2F ToSharpDX(this Perspex.Size p)
+ public static Size2F ToSharpDX(this Size p)
{
return new Size2F((float)p.Width, (float)p.Height);
}
- public static SharpDX.Direct2D1.ExtendMode ToDirect2D(this Perspex.Media.GradientSpreadMethod spreadMethod)
+ public static ExtendMode ToDirect2D(this Perspex.Media.GradientSpreadMethod spreadMethod)
{
if (spreadMethod == Perspex.Media.GradientSpreadMethod.Pad)
return ExtendMode.Clamp;
@@ -43,6 +40,29 @@ namespace Perspex.Direct2D1
else
return ExtendMode.Wrap;
}
+
+ public static SharpDX.Direct2D1.LineJoin ToDirect2D(this Perspex.Media.PenLineJoin lineJoin)
+ {
+ if (lineJoin == Perspex.Media.PenLineJoin.Round)
+ return LineJoin.Round;
+ else if (lineJoin == Perspex.Media.PenLineJoin.Miter)
+ return LineJoin.Miter;
+ else
+ return LineJoin.Bevel;
+ }
+
+ public static SharpDX.Direct2D1.CapStyle ToDirect2D(this Perspex.Media.PenLineCap lineCap)
+ {
+ if (lineCap == Perspex.Media.PenLineCap.Flat)
+ return CapStyle.Flat;
+ else if (lineCap == Perspex.Media.PenLineCap.Round)
+ return CapStyle.Round;
+ else if (lineCap == Perspex.Media.PenLineCap.Square)
+ return CapStyle.Square;
+ else
+ return CapStyle.Triangle;
+ }
+
///
/// Converts a pen to a Direct2D stroke style.
///
@@ -51,19 +71,26 @@ namespace Perspex.Direct2D1
/// The Direct2D brush.
public static StrokeStyle ToDirect2DStrokeStyle(this Perspex.Media.Pen pen, RenderTarget target)
{
- if (pen.DashArray != null && pen.DashArray.Count > 0)
+ if (pen.DashStyle != null)
{
- var properties = new StrokeStyleProperties
+ if (pen.DashStyle.Dashes != null && pen.DashStyle.Dashes.Count > 0)
{
- DashStyle = DashStyle.Custom,
- };
+ var properties = new StrokeStyleProperties
+ {
+ DashStyle = DashStyle.Custom,
+ DashOffset = (float)pen.DashStyle.Offset,
+ MiterLimit = (float)pen.MiterLimit,
+ LineJoin = pen.LineJoin.ToDirect2D(),
+ StartCap = pen.StartLineCap.ToDirect2D(),
+ EndCap = pen.EndLineCap.ToDirect2D(),
+ DashCap = pen.DashCap.ToDirect2D()
+ };
- return new StrokeStyle(target.Factory, properties, pen.DashArray.Select(x => (float)x).ToArray());
- }
- else
- {
- return null;
+ return new StrokeStyle(target.Factory, properties, pen.DashStyle?.Dashes.Select(x => (float)x).ToArray());
+ }
}
+
+ return null;
}
///
@@ -85,7 +112,7 @@ namespace Perspex.Direct2D1
///
/// The
- public static Matrix3x2 ToDirect2D(this Perspex.Matrix matrix)
+ public static Matrix3x2 ToDirect2D(this Matrix matrix)
{
return new Matrix3x2(
(float)matrix.M11,
@@ -101,9 +128,9 @@ namespace Perspex.Direct2D1
///
/// a
- public static Perspex.Matrix ToPerspex(this Matrix3x2 matrix)
+ public static Matrix ToPerspex(this Matrix3x2 matrix)
{
- return new Perspex.Matrix(
+ return new Matrix(
matrix.M11,
matrix.M12,
matrix.M21,
diff --git a/src/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs b/src/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
index b374901632..83ca0abbe7 100644
--- a/src/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
+++ b/src/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
@@ -1,8 +1,5 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System.Reflection;
diff --git a/src/Windows/Perspex.Direct2D1/Renderer.cs b/src/Windows/Perspex.Direct2D1/Renderer.cs
index e82dd2b64d..ca628b08a6 100644
--- a/src/Windows/Perspex.Direct2D1/Renderer.cs
+++ b/src/Windows/Perspex.Direct2D1/Renderer.cs
@@ -1,27 +1,24 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Direct2D1.Media;
+using Perspex.Media;
+using Perspex.Platform;
+using Perspex.Rendering;
+using SharpDX;
+using SharpDX.Direct2D1;
+using Splat;
+using DwFactory = SharpDX.DirectWrite.Factory;
namespace Perspex.Direct2D1
{
- using System;
- using Perspex.Direct2D1.Media;
- using Perspex.Media;
- using Perspex.Platform;
- using Perspex.Rendering;
- using SharpDX;
- using SharpDX.Direct2D1;
- using Splat;
- using DwFactory = SharpDX.DirectWrite.Factory;
-
public class Renderer : RendererBase
{
///
/// The render target.
///
- private RenderTarget renderTarget;
+ private readonly RenderTarget _renderTarget;
///
/// Initializes a new instance of the ();
- this.DirectWriteFactory = Locator.Current.GetService();
+ Direct2DFactory = Locator.Current.GetService();
+ DirectWriteFactory = Locator.Current.GetService();
RenderTargetProperties renderTargetProperties = new RenderTargetProperties
{
@@ -45,8 +42,8 @@ namespace Perspex.Direct2D1
PresentOptions = PresentOptions.Immediately,
};
- this.renderTarget = new WindowRenderTarget(
- this.Direct2DFactory,
+ _renderTarget = new WindowRenderTarget(
+ Direct2DFactory,
renderTargetProperties,
hwndProperties);
}
@@ -57,9 +54,9 @@ namespace Perspex.Direct2D1
/// ();
- this.DirectWriteFactory = Locator.Current.GetService();
- this.renderTarget = renderTarget;
+ Direct2DFactory = Locator.Current.GetService();
+ DirectWriteFactory = Locator.Current.GetService();
+ _renderTarget = renderTarget;
}
///
@@ -67,18 +64,14 @@ namespace Perspex.Direct2D1
///
public Factory Direct2DFactory
{
- get;
- private set;
- }
+ get; }
///
/// Gets the DirectWrite factory.
///
public DwFactory DirectWriteFactory
{
- get;
- private set;
- }
+ get; }
///
/// Resizes the renderer.
@@ -87,13 +80,13 @@ namespace Perspex.Direct2D1
/// An
protected override IDrawingContext CreateDrawingContext(IPlatformHandle handle)
{
- return new DrawingContext(this.renderTarget, this.DirectWriteFactory);
+ return new DrawingContext(_renderTarget, DirectWriteFactory);
+ }
+
+ public override void Dispose()
+ {
+ _renderTarget.Dispose();
}
}
}
diff --git a/src/Windows/Perspex.Direct2D1/packages.config b/src/Windows/Perspex.Direct2D1/packages.config
index cd5fec6b92..cbf7015309 100644
--- a/src/Windows/Perspex.Direct2D1/packages.config
+++ b/src/Windows/Perspex.Direct2D1/packages.config
@@ -7,5 +7,4 @@
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
-
-namespace Perspex.Win32
-{
- using System;
- using System.Globalization;
- using System.IO;
- using System.Reflection;
- using System.Resources;
- using Perspex.Platform;
-
- ///
- /// Loads assets compiled into the application binary.
- ///
- public class AssetLoader : IAssetLoader
- {
- ///
- /// Opens the resource with the requested URI.
- ///
- /// A stream containing the resource contents.
- ///
- /// The resource was not found.
- ///
- public Stream Open(Uri uri)
- {
- var assembly = Assembly.GetEntryAssembly();
- var resourceName = assembly.GetName().Name + ".g";
- var manager = new ResourceManager(resourceName, assembly);
-
- using (var resourceSet = manager.GetResourceSet(CultureInfo.CurrentCulture, true, true))
- {
- var stream = (Stream)resourceSet.GetObject(uri.ToString(), true);
-
- if (stream == null)
- {
- throw new FileNotFoundException($"The requested asset could not be found: {uri}");
- }
-
- return stream;
- }
- }
- }
-}
diff --git a/src/Windows/Perspex.Win32/ClipboardImpl.cs b/src/Windows/Perspex.Win32/ClipboardImpl.cs
new file mode 100644
index 0000000000..9bc08a6336
--- /dev/null
+++ b/src/Windows/Perspex.Win32/ClipboardImpl.cs
@@ -0,0 +1,84 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Perspex.Input.Platform;
+using Perspex.Win32.Interop;
+using System.Runtime.InteropServices;
+
+namespace Perspex.Win32
+{
+ internal class ClipboardImpl : IClipboard
+ {
+ private async Task OpenClipboard()
+ {
+ while (!UnmanagedMethods.OpenClipboard(IntPtr.Zero))
+ {
+ await Task.Delay(100);
+ }
+ }
+
+ public async Task GetTextAsync()
+ {
+ await OpenClipboard();
+ try
+ {
+ IntPtr hText = UnmanagedMethods.GetClipboardData(UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT);
+ if (hText == IntPtr.Zero)
+ {
+ return null;
+ }
+
+ var pText = UnmanagedMethods.GlobalLock(hText);
+ if (pText == IntPtr.Zero)
+ {
+ return null;
+ }
+
+ var rv = Marshal.PtrToStringUni(pText);
+ UnmanagedMethods.GlobalUnlock(hText);
+ return rv;
+ }
+ finally
+ {
+ UnmanagedMethods.CloseClipboard();
+ }
+ }
+
+ public async Task SetTextAsync(string text)
+ {
+ if (text == null)
+ {
+ throw new ArgumentNullException(nameof(text));
+ }
+
+ await OpenClipboard();
+ try
+ {
+ var hGlobal = Marshal.StringToHGlobalUni(text);
+ UnmanagedMethods.SetClipboardData(UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT, hGlobal);
+ }
+ finally
+ {
+ UnmanagedMethods.CloseClipboard();
+ }
+ }
+
+ public async Task ClearAsync()
+ {
+ await OpenClipboard();
+ try
+ {
+ UnmanagedMethods.EmptyClipboard();
+ }
+ finally
+ {
+ UnmanagedMethods.CloseClipboard();
+ }
+ }
+ }
+}
diff --git a/src/Windows/Perspex.Win32/CursorFactory.cs b/src/Windows/Perspex.Win32/CursorFactory.cs
new file mode 100644
index 0000000000..ad2defac35
--- /dev/null
+++ b/src/Windows/Perspex.Win32/CursorFactory.cs
@@ -0,0 +1,62 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Win32.Interop;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Perspex.Input;
+using Perspex.Platform;
+
+namespace Perspex.Win32
+{
+ internal class CursorFactory : IStandardCursorFactory
+ {
+ public static CursorFactory Instance { get; } = new CursorFactory();
+
+ private CursorFactory()
+ {
+ }
+
+ private static readonly Dictionary CursorTypeMapping = new Dictionary
+
+ {
+ { StandardCursorType.AppStarting, 32650 },
+ { StandardCursorType.Arrow, 32512 },
+ { StandardCursorType.Cross, 32515 },
+ { StandardCursorType.Hand, 32649 },
+ { StandardCursorType.Help, 32651 },
+ { StandardCursorType.Ibeam, 32513 },
+ { StandardCursorType.No, 32648 },
+ { StandardCursorType.SizeAll, 32646 },
+
+ // { StandardCursorType.SizeNorthEastSouthWest, 32643 },
+ { StandardCursorType.SizeNorthSouth, 32645 },
+
+ // { StandardCursorType.SizeNorthWestSouthEast, 32642 },
+ { StandardCursorType.SizeWestEast, 32644 },
+ { StandardCursorType.UpArrow, 32516 },
+ { StandardCursorType.Wait, 32514 }
+ };
+
+ private static readonly Dictionary Cache =
+ new Dictionary();
+
+ public IPlatformHandle GetCursor(StandardCursorType cursorType)
+ {
+ IPlatformHandle rv;
+ if (!Cache.TryGetValue(cursorType, out rv))
+ {
+ Cache[cursorType] =
+ rv =
+ new PlatformHandle(
+ UnmanagedMethods.LoadCursor(IntPtr.Zero, new IntPtr(CursorTypeMapping[cursorType])),
+ PlatformConstants.CursorHandleType);
+ }
+
+ return rv;
+ }
+ }
+}
diff --git a/src/Windows/Perspex.Win32/Embedding/EmbeddedWindowImpl.cs b/src/Windows/Perspex.Win32/Embedding/EmbeddedWindowImpl.cs
index d09b92f78b..052e83a28f 100644
--- a/src/Windows/Perspex.Win32/Embedding/EmbeddedWindowImpl.cs
+++ b/src/Windows/Perspex.Win32/Embedding/EmbeddedWindowImpl.cs
@@ -1,8 +1,11 @@
-namespace Perspex.Win32
-{
- using System;
- using Perspex.Win32.Interop;
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Win32.Interop;
+namespace Perspex.Win32
+{
public class EmbeddedWindowImpl : WindowImpl
{
private static readonly System.Windows.Forms.UserControl WinFormsControl = new System.Windows.Forms.UserControl();
@@ -16,15 +19,15 @@
atom,
null,
(int)UnmanagedMethods.WindowStyles.WS_CHILD,
- UnmanagedMethods.CW_USEDEFAULT,
- UnmanagedMethods.CW_USEDEFAULT,
- UnmanagedMethods.CW_USEDEFAULT,
- UnmanagedMethods.CW_USEDEFAULT,
+ 0,
+ 0,
+ 640,
+ 480,
WinFormsControl.Handle,
IntPtr.Zero,
IntPtr.Zero,
IntPtr.Zero);
- this.Handle = hWnd;
+ Handle = hWnd;
return hWnd;
}
}
diff --git a/src/Windows/Perspex.Win32/Input/KeyInterop.cs b/src/Windows/Perspex.Win32/Input/KeyInterop.cs
index a9cc56a570..658313a27b 100644
--- a/src/Windows/Perspex.Win32/Input/KeyInterop.cs
+++ b/src/Windows/Perspex.Win32/Input/KeyInterop.cs
@@ -1,19 +1,16 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Text;
+using Perspex.Input;
+using Perspex.Win32.Interop;
namespace Perspex.Win32.Input
{
- using System.Collections.Generic;
- using System.Text;
- using Perspex.Input;
- using Perspex.Win32.Interop;
-
public static class KeyInterop
{
- private static Dictionary virtualKeyFromKey = new Dictionary
+ private static readonly Dictionary s_virtualKeyFromKey = new Dictionary
{
{ Key.None, 0 },
{ Key.Cancel, 3 },
@@ -190,7 +187,7 @@ namespace Perspex.Win32.Input
{ Key.DeadCharProcessed, 0 },
};
- private static Dictionary keyFromVirtualKey = new Dictionary
+ private static readonly Dictionary s_keyFromVirtualKey = new Dictionary
{
{ 0, Key.None },
{ 3, Key.Cancel },
@@ -368,14 +365,14 @@ namespace Perspex.Win32.Input
public static Key KeyFromVirtualKey(int virtualKey)
{
Key result;
- keyFromVirtualKey.TryGetValue(virtualKey, out result);
+ s_keyFromVirtualKey.TryGetValue(virtualKey, out result);
return result;
}
public static int VirtualKeyFromKey(Key key)
{
int result;
- virtualKeyFromKey.TryGetValue(key, out result);
+ s_virtualKeyFromKey.TryGetValue(key, out result);
return result;
}
}
diff --git a/src/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs b/src/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
index ab01df1f05..0f40007f5b 100644
--- a/src/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
+++ b/src/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
@@ -1,49 +1,44 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Text;
+using Perspex.Controls;
+using Perspex.Input;
+using Perspex.Win32.Interop;
namespace Perspex.Win32.Input
{
- using System.Text;
- using Perspex.Controls;
- using Perspex.Input;
- using Perspex.Win32.Interop;
-
public class WindowsKeyboardDevice : KeyboardDevice
{
- private static WindowsKeyboardDevice instance = new WindowsKeyboardDevice();
+ private static readonly WindowsKeyboardDevice s_instance = new WindowsKeyboardDevice();
- private byte[] keyStates = new byte[256];
+ private readonly byte[] _keyStates = new byte[256];
- public static new WindowsKeyboardDevice Instance
- {
- get { return instance; }
- }
+ public static new WindowsKeyboardDevice Instance => s_instance;
- public override ModifierKeys Modifiers
+ public ModifierKeys Modifiers
{
get
{
+ UpdateKeyStates();
ModifierKeys result = 0;
- if (this.IsDown(Key.LeftAlt) || this.IsDown(Key.RightAlt))
+ if (IsDown(Key.LeftAlt) || IsDown(Key.RightAlt))
{
result |= ModifierKeys.Alt;
}
- if (this.IsDown(Key.LeftCtrl) || this.IsDown(Key.RightCtrl))
+ if (IsDown(Key.LeftCtrl) || IsDown(Key.RightCtrl))
{
result |= ModifierKeys.Control;
}
- if (this.IsDown(Key.LeftShift) || this.IsDown(Key.RightShift))
+ if (IsDown(Key.LeftShift) || IsDown(Key.RightShift))
{
result |= ModifierKeys.Shift;
}
- if (this.IsDown(Key.LWin) || this.IsDown(Key.RWin))
+ if (IsDown(Key.LWin) || IsDown(Key.RWin))
{
result |= ModifierKeys.Windows;
}
@@ -54,7 +49,7 @@ namespace Perspex.Win32.Input
public void WindowActivated(Window window)
{
- this.SetFocusedElement(window, NavigationMethod.Unspecified);
+ SetFocusedElement(window, NavigationMethod.Unspecified);
}
public string StringFromVirtualKey(uint virtualKey)
@@ -63,27 +58,27 @@ namespace Perspex.Win32.Input
int length = UnmanagedMethods.ToUnicode(
virtualKey,
0,
- this.keyStates,
+ _keyStates,
result,
256,
0);
return result.ToString();
}
- internal void UpdateKeyStates()
+ private void UpdateKeyStates()
{
- UnmanagedMethods.GetKeyboardState(this.keyStates);
+ UnmanagedMethods.GetKeyboardState(_keyStates);
}
private bool IsDown(Key key)
{
- return (this.GetKeyStates(key) & KeyStates.Down) != 0;
+ return (GetKeyStates(key) & KeyStates.Down) != 0;
}
private KeyStates GetKeyStates(Key key)
{
int vk = KeyInterop.VirtualKeyFromKey(key);
- byte state = this.keyStates[vk];
+ byte state = _keyStates[vk];
KeyStates result = 0;
if ((state & 0x80) != 0)
diff --git a/src/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs b/src/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
index 70efa8d4de..dd8aafdaa4 100644
--- a/src/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
+++ b/src/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
@@ -1,24 +1,18 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Input;
+using Perspex.Interactivity;
+using Perspex.Win32.Interop;
namespace Perspex.Win32.Input
{
- using System;
- using Perspex.Input;
- using Perspex.Interactivity;
- using Perspex.Win32.Interop;
-
public class WindowsMouseDevice : MouseDevice
{
- private static WindowsMouseDevice instance = new WindowsMouseDevice();
+ private static readonly WindowsMouseDevice s_instance = new WindowsMouseDevice();
- public static new WindowsMouseDevice Instance
- {
- get { return instance; }
- }
+ public static new WindowsMouseDevice Instance => s_instance;
public WindowImpl CurrentWindow
{
@@ -32,7 +26,7 @@ namespace Perspex.Win32.Input
if (control != null)
{
- UnmanagedMethods.SetCapture(this.CurrentWindow.Handle.Handle);
+ UnmanagedMethods.SetCapture(CurrentWindow.Handle.Handle);
}
else
{
diff --git a/src/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
index ff8792ccc2..8b5f0223ba 100644
--- a/src/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
@@ -1,16 +1,15 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2013 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+using System.Text;
+// ReSharper disable InconsistentNaming
+#pragma warning disable 169
namespace Perspex.Win32.Interop
{
- using System;
- using System.Diagnostics.CodeAnalysis;
- using System.Runtime.InteropServices;
- using System.Text;
-
[SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation", Justification = "Using Win32 naming for consistency.")]
[SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1307:AccessibleFieldsMustBeginWithUpperCaseLetter", Justification = "Using Win32 naming for consistency.")]
[SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Using Win32 naming for consistency.")]
@@ -572,7 +571,9 @@ namespace Perspex.Win32.Interop
public static extern bool KillTimer(IntPtr hWnd, IntPtr uIDEvent);
[DllImport("user32.dll")]
- public static extern IntPtr LoadCursor(IntPtr hInstance, int lpCursorName);
+ public static extern IntPtr LoadCursor(IntPtr hInstance, IntPtr lpCursorName);
+
+
[DllImport("user32.dll")]
public static extern bool PeekMessage(out MSG lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax, uint wRemoveMsg);
@@ -627,6 +628,71 @@ namespace Perspex.Win32.Interop
[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
public static extern bool SetWindowText(IntPtr hwnd, string lpString);
+ public enum ClassLongIndex : int
+ {
+ GCL_HCURSOR = -12,
+ GCL_HICON = -14
+ }
+
+ [DllImport("user32.dll", EntryPoint = "SetClassLongPtr")]
+ private static extern IntPtr SetClassLong64(IntPtr hWnd, ClassLongIndex nIndex, IntPtr dwNewLong);
+
+ [DllImport("user32.dll", EntryPoint = "SetClassLong")]
+ private static extern IntPtr SetClassLong32(IntPtr hWnd, ClassLongIndex nIndex, IntPtr dwNewLong);
+
+ public static IntPtr SetClassLong(IntPtr hWnd, ClassLongIndex nIndex, IntPtr dwNewLong)
+ {
+ if (IntPtr.Size == 4)
+ {
+ return SetClassLong32(hWnd, nIndex, dwNewLong);
+ }
+
+ return SetClassLong64(hWnd, nIndex, dwNewLong);
+ }
+
+ [DllImport("user32.dll", SetLastError = true)]
+ public static extern bool OpenClipboard(IntPtr hWndOwner);
+
+ [DllImport("user32.dll", SetLastError = true)]
+ public static extern bool CloseClipboard();
+
+ [DllImport("user32.dll")]
+ public static extern bool EmptyClipboard();
+
+ [DllImport("user32.dll")]
+ public static extern IntPtr GetClipboardData(ClipboardFormat uFormat);
+
+ [DllImport("user32.dll")]
+ public static extern IntPtr SetClipboardData(ClipboardFormat uFormat, IntPtr hMem);
+
+ [DllImport("kernel32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+ public static extern IntPtr GlobalLock(IntPtr handle);
+
+
+ [DllImport("kernel32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+ public static extern bool GlobalUnlock(IntPtr handle);
+
+ [DllImport("kernel32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+ public static extern IntPtr GlobalAlloc(int uFlags, int dwBytes);
+
+ [DllImport("kernel32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+ public static extern IntPtr GlobalFree(IntPtr hMem);
+
+ [DllImport("comdlg32.dll", CharSet = CharSet.Unicode, EntryPoint = "GetSaveFileNameW")]
+ public static extern bool GetSaveFileName(IntPtr lpofn);
+
+ [DllImport("comdlg32.dll", CharSet = CharSet.Unicode, EntryPoint = "GetOpenFileNameW")]
+ public static extern bool GetOpenFileName(IntPtr lpofn);
+
+ [DllImport("comdlg32.dll")]
+ public static extern int CommDlgExtendedError();
+
+ public enum ClipboardFormat
+ {
+ CF_TEXT = 1,
+ CF_UNICODETEXT = 13
+ }
+
public struct MSG
{
public IntPtr hwnd;
@@ -687,5 +753,49 @@ namespace Perspex.Win32.Interop
public string lpszClassName;
public IntPtr hIconSm;
}
+
+ [Flags]
+ public enum OpenFileNameFlags
+ {
+
+ OFN_ALLOWMULTISELECT = 0x00000200,
+
+ OFN_EXPLORER = 0x00080000,
+
+ OFN_HIDEREADONLY = 0x00000004,
+
+ OFN_NOREADONLYRETURN = 0x00008000,
+
+ OFN_OVERWRITEPROMPT = 0x00000002
+
+ }
+
+ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+ public struct OpenFileName
+ {
+ public int lStructSize;
+ public IntPtr hwndOwner;
+ public IntPtr hInstance;
+ public IntPtr lpstrFilter;
+ public IntPtr lpstrCustomFilter;
+ public int nMaxCustFilter;
+ public int nFilterIndex;
+ public IntPtr lpstrFile;
+ public int nMaxFile;
+ public IntPtr lpstrFileTitle;
+ public int nMaxFileTitle;
+ public IntPtr lpstrInitialDir;
+ public IntPtr lpstrTitle;
+ public OpenFileNameFlags Flags;
+ private ushort Unused;
+ private ushort Unused2;
+ public IntPtr lpstrDefExt;
+ public IntPtr lCustData;
+ public IntPtr lpfnHook;
+ public IntPtr lpTemplateName;
+ public IntPtr reservedPtr;
+ public int reservedInt;
+ public int flagsEx;
+ }
}
}
diff --git a/src/Windows/Perspex.Win32/Perspex.Win32.csproj b/src/Windows/Perspex.Win32/Perspex.Win32.csproj
index 80946479fe..8c84a7a307 100644
--- a/src/Windows/Perspex.Win32/Perspex.Win32.csproj
+++ b/src/Windows/Perspex.Win32/Perspex.Win32.csproj
@@ -23,6 +23,7 @@
prompt
4
bin\Debug\Perspex.Win32.XML
+ true
pdbonly
@@ -32,12 +33,9 @@
prompt
4
bin\Release\Perspex.Win32.XML
+ true
-
- ..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
..\..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll
+
+ ..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
+
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
- {799a7bb5-3c2c-48b6-85a7-406a12c420da}
+ {799A7BB5-3C2C-48B6-85A7-406A12C420DA}
Perspex.Application
@@ -122,9 +126,7 @@
Perspex.Styling
-
-
+
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs b/tests/Perspex.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..575bdbad2f
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Reflection;
+
+[assembly: AssemblyTitle("Perspex.Markup.Xaml.UnitTests")]
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/PropertyMountPointTest.cs b/tests/Perspex.Markup.Xaml.UnitTests/PropertyMountPointTest.cs
new file mode 100644
index 0000000000..1b15094af5
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/PropertyMountPointTest.cs
@@ -0,0 +1,18 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Markup.Xaml.DataBinding.ChangeTracking;
+using System;
+using Xunit;
+
+namespace Perspex.Xaml.Base.UnitTest
+{
+ public class PropertyMountPointTest
+ {
+ [Fact]
+ public void SourceAndPathAreNull()
+ {
+ Assert.Throws(() => new PropertyMountPoint(null, null));
+ }
+ }
+}
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level1.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level1.cs
new file mode 100644
index 0000000000..e3ec6d96a3
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level1.cs
@@ -0,0 +1,44 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Perspex.Xaml.Base.UnitTest.SampleModel
+{
+ public class Level1 : PropertyChangeNotifier
+ {
+ private Level2 _level2 = new Level2();
+ private DateTime _dateTime;
+ private string _text;
+
+ public Level2 Level2
+ {
+ get { return _level2; }
+ set
+ {
+ _level2 = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public string Text
+ {
+ get { return _text; }
+ set
+ {
+ _text = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public DateTime DateTime
+ {
+ get { return _dateTime; }
+ set
+ {
+ _dateTime = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level2.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level2.cs
new file mode 100644
index 0000000000..0862309a97
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level2.cs
@@ -0,0 +1,20 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Perspex.Xaml.Base.UnitTest.SampleModel
+{
+ public class Level2 : PropertyChangeNotifier
+ {
+ private Level3 _level3 = new Level3();
+
+ public Level3 Level3
+ {
+ get { return _level3; }
+ set
+ {
+ _level3 = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level3.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level3.cs
new file mode 100644
index 0000000000..c22e7c268c
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Level3.cs
@@ -0,0 +1,20 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Perspex.Xaml.Base.UnitTest.SampleModel
+{
+ public class Level3 : PropertyChangeNotifier
+ {
+ private int _property = 10;
+
+ public int Property
+ {
+ get { return _property; }
+ set
+ {
+ _property = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/LogInViewModel.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/LogInViewModel.cs
new file mode 100644
index 0000000000..2b479b2f73
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/LogInViewModel.cs
@@ -0,0 +1,32 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using ReactiveUI;
+
+namespace Perspex.Xaml.Base.UnitTest.SampleModel
+{
+ public class LogInViewModel : ReactiveObject
+ {
+ private string _username;
+
+ public LogInViewModel()
+ {
+ OkCommand = ReactiveCommand.Create(
+ this.WhenAnyValue(
+ x => x.Username,
+ x => !string.IsNullOrWhiteSpace(x)));
+ }
+
+ public string Username
+ {
+ get { return _username; }
+ set { this.RaiseAndSetIfChanged(ref _username, value); }
+ }
+
+ public ReactiveCommand OkCommand
+ {
+ get;
+ private set;
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/MainWindowViewModel.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/MainWindowViewModel.cs
new file mode 100644
index 0000000000..39ea070789
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/MainWindowViewModel.cs
@@ -0,0 +1,41 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Xaml.Base.UnitTest.SampleModel;
+using ReactiveUI;
+
+namespace GitHubClient.ViewModels
+{
+ public class MainWindowViewModel : ReactiveObject
+ {
+ private object _content;
+
+ private LogInViewModel _login;
+
+ public MainWindowViewModel()
+ {
+ ShowLogin();
+ }
+
+ public object Content
+ {
+ get { return _content; }
+ set { this.RaiseAndSetIfChanged(ref _content, value); }
+ }
+
+ private void ShowLogin()
+ {
+ _login = new LogInViewModel();
+ _login.OkCommand.Subscribe(_ => ShowRepositories());
+ Content = _login;
+ }
+
+ private void ShowRepositories()
+ {
+ var vm = new UserRepositoriesViewModel();
+ var task = vm.Load(_login.Username);
+ Content = vm;
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/PropertyChangeNotifier.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/PropertyChangeNotifier.cs
new file mode 100644
index 0000000000..c9dcebac85
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/PropertyChangeNotifier.cs
@@ -0,0 +1,18 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Perspex.Xaml.Base.UnitTest.SampleModel
+{
+ public abstract class PropertyChangeNotifier : INotifyPropertyChanged
+ {
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Repository.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Repository.cs
new file mode 100644
index 0000000000..dde5243264
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/Repository.cs
@@ -0,0 +1,17 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace GitHubClient.ViewModels
+{
+ public class Repository
+ {
+ private readonly string _name;
+
+ public Repository(string name)
+ {
+ _name = name;
+ }
+
+ public string Name => _name;
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/UserRepositoriesViewModel.cs b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/UserRepositoriesViewModel.cs
new file mode 100644
index 0000000000..4fce0e90b4
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SampleModel/UserRepositoriesViewModel.cs
@@ -0,0 +1,26 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GitHubClient.ViewModels;
+using ReactiveUI;
+
+namespace Perspex.Xaml.Base.UnitTest.SampleModel
+{
+ public class UserRepositoriesViewModel : ReactiveObject
+ {
+ private IReadOnlyList _repositories;
+
+ public async Task Load(string username)
+ {
+ Repositories = await new Task>(() => new List { new Repository("Blah"), new Repository("Bleh") });
+ }
+
+ public IReadOnlyList Repositories
+ {
+ get { return _repositories; }
+ private set { this.RaiseAndSetIfChanged(ref _repositories, value); }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/SamplePerspexObject.cs b/tests/Perspex.Markup.Xaml.UnitTests/SamplePerspexObject.cs
new file mode 100644
index 0000000000..60aaf4c586
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/SamplePerspexObject.cs
@@ -0,0 +1,28 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Perspex.Xaml.Base.UnitTest
+{
+ internal class SamplePerspexObject : PerspexObject
+ {
+ public static readonly PerspexProperty StringProperty =
+ PerspexProperty.Register("StrProp", string.Empty);
+
+ public static readonly PerspexProperty IntProperty =
+ PerspexProperty.Register("IntProp");
+
+ public int Int
+ {
+ get { return GetValue(IntProperty); }
+ set { SetValue(IntProperty, value); }
+ }
+
+ public string String
+ {
+ get { return GetValue(StringProperty); }
+ set { SetValue(StringProperty, value); }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/TypeProviderMock.cs b/tests/Perspex.Markup.Xaml.UnitTests/TypeProviderMock.cs
new file mode 100644
index 0000000000..673369f641
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/TypeProviderMock.cs
@@ -0,0 +1,38 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using OmniXaml;
+using System;
+
+namespace Perspex.Xaml.Base.UnitTest
+{
+ internal class TypeProviderMock : ITypeProvider
+ {
+ private readonly string _typeName;
+ private readonly string _clrNamespace;
+ private readonly string _assemblyName;
+ private readonly Type _typeToReturn;
+
+ public TypeProviderMock(string typeName, string clrNamespace, string assemblyName, Type typeToReturn)
+ {
+ _typeName = typeName;
+ _clrNamespace = clrNamespace;
+ _assemblyName = assemblyName;
+ _typeToReturn = typeToReturn;
+ }
+
+ public TypeProviderMock()
+ {
+ }
+
+ public Type GetType(string typeName, string clrNamespace, string assemblyName)
+ {
+ if (_typeName == typeName && _clrNamespace == clrNamespace && _assemblyName == assemblyName)
+ {
+ return _typeToReturn;
+ }
+
+ throw new TypeNotFoundException("The Type cannot be found");
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/ViewModelMock.cs b/tests/Perspex.Markup.Xaml.UnitTests/ViewModelMock.cs
new file mode 100644
index 0000000000..4bdfe94e0e
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/ViewModelMock.cs
@@ -0,0 +1,41 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Perspex.Xaml.Base.UnitTest
+{
+ internal class ViewModelMock : INotifyPropertyChanged
+ {
+ private string _str;
+ private int _intProp;
+
+ public int IntProp
+ {
+ get { return _intProp; }
+ set
+ {
+ _intProp = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public string StrProp
+ {
+ get { return _str; }
+ set
+ {
+ _str = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ private void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/XamlBindingTest.cs b/tests/Perspex.Markup.Xaml.UnitTests/XamlBindingTest.cs
new file mode 100644
index 0000000000..d7ee56245f
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/XamlBindingTest.cs
@@ -0,0 +1,21 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Moq;
+using Perspex.Markup.Xaml.DataBinding;
+using OmniXaml.TypeConversion;
+using Xunit;
+
+namespace Perspex.Xaml.Base.UnitTest
+{
+ public class XamlBindingTest
+ {
+ [Fact]
+ public void TestNullDataContext()
+ {
+ var t = new Mock();
+ var sut = new XamlBinding(t.Object);
+ sut.BindToDataContext(null);
+ }
+ }
+}
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/packages.config b/tests/Perspex.Markup.Xaml.UnitTests/packages.config
new file mode 100644
index 0000000000..c7f996e816
--- /dev/null
+++ b/tests/Perspex.Markup.Xaml.UnitTests/packages.config
@@ -0,0 +1,17 @@
+
+
+
\ No newline at end of file
diff --git a/tests/Perspex.RenderTests/Controls/BorderTests.cs b/tests/Perspex.RenderTests/Controls/BorderTests.cs
index 4e2606d8c1..0383bb01a6 100644
Binary files a/tests/Perspex.RenderTests/Controls/BorderTests.cs and b/tests/Perspex.RenderTests/Controls/BorderTests.cs differ
diff --git a/tests/Perspex.RenderTests/Controls/ImageTests.cs b/tests/Perspex.RenderTests/Controls/ImageTests.cs
index 90511ac125..2f43cbdae1 100644
Binary files a/tests/Perspex.RenderTests/Controls/ImageTests.cs and b/tests/Perspex.RenderTests/Controls/ImageTests.cs differ
diff --git a/tests/Perspex.RenderTests/GlobalSuppressions.cs b/tests/Perspex.RenderTests/GlobalSuppressions.cs
deleted file mode 100644
index 254dbfdb94..0000000000
--- a/tests/Perspex.RenderTests/GlobalSuppressions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2015 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(
- "StyleCop.CSharp.MaintainabilityRules",
- "SA1401:Fields must be private",
- Justification = "PerspexProperty fields should not be private.")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(
- "StyleCop.CSharp.DocumentationRules",
- "SA1600:Elements must be documented",
- Justification = "Tests should be self-documenting")]
\ No newline at end of file
diff --git a/tests/Perspex.RenderTests/Media/ImageBrushTests.cs b/tests/Perspex.RenderTests/Media/ImageBrushTests.cs
new file mode 100644
index 0000000000..2c958977b7
--- /dev/null
+++ b/tests/Perspex.RenderTests/Media/ImageBrushTests.cs
@@ -0,0 +1,351 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Controls;
+using Perspex.Controls.Shapes;
+using Perspex.Layout;
+using Perspex.Media;
+using Perspex.Media.Imaging;
+using Xunit;
+
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Media
+#else
+namespace Perspex.Direct2D1.RenderTests.Media
+#endif
+{
+ public class ImageBrushTests : TestBase
+ {
+ public ImageBrushTests()
+ : base(@"Media\ImageBrush")
+ {
+ }
+
+ private string BitmapPath
+ {
+ get { return System.IO.Path.Combine(OutputPath, "github_icon.png"); }
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_NoTile_Alignment_TopLeft()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ AlignmentX = AlignmentX.Left,
+ AlignmentY = AlignmentY.Top,
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_NoTile_Alignment_Center()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ AlignmentX = AlignmentX.Center,
+ AlignmentY = AlignmentY.Center,
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_NoTile_Alignment_BottomRight()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ AlignmentX = AlignmentX.Right,
+ AlignmentY = AlignmentY.Bottom,
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_Fill_NoTile()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 920,
+ Height = 920,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.Fill,
+ TileMode = TileMode.None,
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_Uniform_NoTile()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 300,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.Uniform,
+ TileMode = TileMode.None,
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_UniformToFill_NoTile()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 300,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.UniformToFill,
+ TileMode = TileMode.None,
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_NoTile_BottomRightQuarterSource()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ SourceRect = new RelativeRect(250, 250, 250, 250, RelativeUnit.Absolute),
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_NoTile_BottomRightQuarterDest()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ DestinationRect = new RelativeRect(92, 92, 92, 92, RelativeUnit.Absolute),
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+ DestinationRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.Tile,
+ SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+ DestinationRect = new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+#if PERSPEX_CAIRO
+ [Fact(Skip = "TileMode.FlipX not yet supported on cairo")]
+#else
+ [Fact]
+#endif
+ public void ImageBrush_NoStretch_FlipX_TopLeftDest()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.FlipX,
+ DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, RelativeUnit.Relative),
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+#if PERSPEX_CAIRO
+ [Fact(Skip = "TileMode.FlipY not yet supported on cairo")]
+#else
+ [Fact]
+#endif
+ public void ImageBrush_NoStretch_FlipY_TopLeftDest()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.FlipY,
+ DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, RelativeUnit.Relative),
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void ImageBrush_NoStretch_FlipXY_TopLeftDest()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Rectangle
+ {
+ Fill = new ImageBrush
+ {
+ Stretch = Stretch.None,
+ TileMode = TileMode.FlipXY,
+ DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, RelativeUnit.Relative),
+ Source = new Bitmap(BitmapPath),
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+ }
+}
diff --git a/tests/Perspex.RenderTests/Media/LinearGradientBrushTests.cs b/tests/Perspex.RenderTests/Media/LinearGradientBrushTests.cs
index a2f00bfb07..8d5185096d 100644
--- a/tests/Perspex.RenderTests/Media/LinearGradientBrushTests.cs
+++ b/tests/Perspex.RenderTests/Media/LinearGradientBrushTests.cs
@@ -1,14 +1,21 @@
-namespace Perspex.Direct2D1.RenderTests.Media
-{
- using Perspex.Controls;
- using Perspex.Media;
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Text;
- using System.Threading.Tasks;
- using Xunit;
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Controls;
+using Perspex.Media;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Media
+#else
+namespace Perspex.Direct2D1.RenderTests.Media
+#endif
+{
public class LinearGradientBrushTests : TestBase
{
public LinearGradientBrushTests() : base(@"Media\LinearGradientBrush")
@@ -16,7 +23,34 @@
}
[Fact]
- public void LinearGradientBrush_RedBlue_Fill()
+ public void LinearGradientBrush_RedBlue_Horizontal_Fill()
+ {
+ Decorator target = new Decorator
+ {
+ Padding = new Thickness(8),
+ Width = 200,
+ Height = 200,
+ Child = new Border
+ {
+ Background = new LinearGradientBrush
+ {
+ StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+ EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+ GradientStops =
+ {
+ new GradientStop { Color = Colors.Red, Offset = 0 },
+ new GradientStop { Color = Colors.Blue, Offset = 1 }
+ }
+ }
+ }
+ };
+
+ RenderToFile(target);
+ CompareImages();
+ }
+
+ [Fact]
+ public void LinearGradientBrush_RedBlue_Vertical_Fill()
{
Decorator target = new Decorator
{
@@ -27,8 +61,8 @@
{
Background = new LinearGradientBrush
{
- StartPoint = new Point(0, 0.5),
- EndPoint = new Point(1, 0.5),
+ StartPoint = new RelativePoint(0.5, 0, RelativeUnit.Relative),
+ EndPoint = new RelativePoint(0.5, 1, RelativeUnit.Relative),
GradientStops =
{
new GradientStop { Color = Colors.Red, Offset = 0 },
@@ -38,8 +72,8 @@
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
}
}
diff --git a/tests/Perspex.RenderTests/Media/VisualBrushTests.cs b/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
index 7b32a223ce..cae9d4fbf4 100644
--- a/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
@@ -1,17 +1,19 @@
-// -----------------------------------------------------------------------
-//
-// Copyright 2014 MIT Licence. See licence.md for more information.
-//
-// -----------------------------------------------------------------------
-
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Perspex.Controls;
+using Perspex.Controls.Shapes;
+using Perspex.Layout;
+using Perspex.Media;
+using Perspex.Media.Imaging;
+using Xunit;
+
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Media
+#else
namespace Perspex.Direct2D1.RenderTests.Media
+#endif
{
- using Perspex.Controls;
- using Perspex.Controls.Shapes;
- using Perspex.Layout;
- using Perspex.Media;
- using Xunit;
-
public class VisualBrushTests : TestBase
{
public VisualBrushTests()
@@ -19,86 +21,45 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
}
- [Fact]
- public void VisualBrush_Align_TopLeft()
+ private string BitmapPath
{
- Decorator target = new Decorator
- {
- Padding = new Thickness(8),
- Width = 200,
- Height = 200,
- Child = new Rectangle
- {
- Fill = new VisualBrush
- {
- AlignmentX = AlignmentX.Left,
- AlignmentY = AlignmentY.Top,
- Stretch = Stretch.None,
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
- }
- }
- };
-
- this.RenderToFile(target);
- this.CompareImages();
+ get { return System.IO.Path.Combine(OutputPath, "github_icon.png"); }
}
- [Fact]
- public void VisualBrush_Align_Center()
+ private Control Visual
{
- Decorator target = new Decorator
+ get
{
- Padding = new Thickness(8),
- Width = 200,
- Height = 200,
- Child = new Rectangle
+ return new Panel
{
- Fill = new VisualBrush
+ Children = new Perspex.Controls.Controls
{
- AlignmentX = AlignmentX.Center,
- AlignmentY = AlignmentY.Center,
- Stretch = Stretch.None,
- Visual = new Border
+ new Image
+ {
+ Source = new Bitmap(BitmapPath),
+ },
+ new Border
{
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
+ BorderBrush = Brushes.Blue,
BorderThickness = 2,
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
Child = new TextBlock
{
- Text = "Perspex",
- FontSize = 12,
+ FontSize = 24,
FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
+ Background = Brushes.Green,
+ Foreground = Brushes.Yellow,
+ Text = "VisualBrush",
}
}
}
- }
- };
-
- this.RenderToFile(target);
- this.CompareImages();
+ };
+ }
}
[Fact]
- public void VisualBrush_Align_BottomRight()
+ public void VisualBrush_NoStretch_NoTile_Alignment_TopLeft()
{
Decorator target = new Decorator
{
@@ -109,220 +70,156 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
Fill = new VisualBrush
{
- AlignmentX = AlignmentX.Right,
- AlignmentY = AlignmentY.Bottom,
Stretch = Stretch.None,
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ TileMode = TileMode.None,
+ AlignmentX = AlignmentX.Left,
+ AlignmentY = AlignmentY.Top,
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
[Fact]
- public void VisualBrush_Stretch_Fill_Large()
+#endif
+ public void VisualBrush_NoStretch_NoTile_Alignment_Center()
{
Decorator target = new Decorator
{
Padding = new Thickness(8),
- Width = 920,
- Height = 920,
+ Width = 200,
+ Height = 200,
Child = new Rectangle
{
Fill = new VisualBrush
{
- Stretch = Stretch.Fill,
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ AlignmentX = AlignmentX.Center,
+ AlignmentY = AlignmentY.Center,
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
[Fact]
- public void VisualBrush_Stretch_Uniform()
+ public void VisualBrush_NoStretch_NoTile_Alignment_BottomRight()
{
Decorator target = new Decorator
{
Padding = new Thickness(8),
- Width = 920,
- Height = 820,
+ Width = 200,
+ Height = 200,
Child = new Rectangle
{
Fill = new VisualBrush
{
- Stretch = Stretch.Uniform,
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ AlignmentX = AlignmentX.Right,
+ AlignmentY = AlignmentY.Bottom,
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
[Fact]
- public void VisualBrush_Stretch_UniformToFill()
+#endif
+ public void VisualBrush_Fill_NoTile()
{
Decorator target = new Decorator
{
Padding = new Thickness(8),
Width = 920,
- Height = 820,
+ Height = 920,
Child = new Rectangle
{
Fill = new VisualBrush
{
- Stretch = Stretch.UniformToFill,
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ Stretch = Stretch.Fill,
+ TileMode = TileMode.None,
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
[Fact]
- public void VisualBrush_SourceRect_Absolute()
+#endif
+ public void VisualBrush_Uniform_NoTile()
{
Decorator target = new Decorator
{
Padding = new Thickness(8),
- Width = 200,
+ Width = 300,
Height = 200,
Child = new Rectangle
{
Fill = new VisualBrush
{
- SourceRect = new RelativeRect(40, 40, 100, 100, OriginUnit.Pixels),
- Visual = new Border
- {
- Width = 180,
- Height = 180,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new Ellipse
- {
- Width = 100,
- Height = 100,
- Fill = Brushes.Yellow,
- VerticalAlignment = VerticalAlignment.Center,
- HorizontalAlignment = HorizontalAlignment.Center,
- }
- }
+ Stretch = Stretch.Uniform,
+ TileMode = TileMode.None,
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
[Fact]
- public void VisualBrush_DestinationRect_Absolute()
+#endif
+ public void VisualBrush_UniformToFill_NoTile()
{
Decorator target = new Decorator
{
Padding = new Thickness(8),
- Width = 200,
+ Width = 300,
Height = 200,
Child = new Rectangle
{
Fill = new VisualBrush
{
- DestinationRect = new RelativeRect(92, 92, 92, 92, OriginUnit.Pixels),
- Visual = new Border
- {
- Width = 180,
- Height = 180,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new Ellipse
- {
- Width = 100,
- Height = 100,
- Fill = Brushes.Yellow,
- VerticalAlignment = VerticalAlignment.Center,
- HorizontalAlignment = HorizontalAlignment.Center,
- }
- }
+ Stretch = Stretch.UniformToFill,
+ TileMode = TileMode.None,
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
[Fact]
- public void VisualBrush_SourceRect_DestinationRect_Absolute()
+ public void VisualBrush_NoStretch_NoTile_BottomRightQuarterSource()
{
Decorator target = new Decorator
{
@@ -333,34 +230,24 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
Fill = new VisualBrush
{
- SourceRect = new RelativeRect(40, 40, 100, 100, OriginUnit.Pixels),
- DestinationRect = new RelativeRect(92, 92, 92, 92, OriginUnit.Pixels),
- Visual = new Border
- {
- Width = 180,
- Height = 180,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new Ellipse
- {
- Width = 100,
- Height = 100,
- Fill = Brushes.Yellow,
- VerticalAlignment = VerticalAlignment.Center,
- HorizontalAlignment = HorizontalAlignment.Center,
- }
- }
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ SourceRect = new RelativeRect(250, 250, 250, 250, RelativeUnit.Absolute),
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
[Fact]
- public void VisualBrush_SourceRect_DestinationRect_Percent()
+#endif
+ public void VisualBrush_NoStretch_NoTile_BottomRightQuarterDest()
{
Decorator target = new Decorator
{
@@ -371,34 +258,20 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
Fill = new VisualBrush
{
- SourceRect = new RelativeRect(0.22, 0.22, 0.56, 0.56, OriginUnit.Percent),
- DestinationRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, OriginUnit.Percent),
- Visual = new Border
- {
- Width = 180,
- Height = 180,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new Ellipse
- {
- Width = 100,
- Height = 100,
- Fill = Brushes.Yellow,
- VerticalAlignment = VerticalAlignment.Center,
- HorizontalAlignment = HorizontalAlignment.Center,
- }
- }
+ Stretch = Stretch.None,
+ TileMode = TileMode.None,
+ DestinationRect = new RelativeRect(92, 92, 92, 92, RelativeUnit.Absolute),
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
[Fact]
- public void VisualBrush_Tile()
+ public void VisualBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest()
{
Decorator target = new Decorator
{
@@ -410,34 +283,20 @@ namespace Perspex.Direct2D1.RenderTests.Media
Fill = new VisualBrush
{
Stretch = Stretch.None,
- TileMode = TileMode.Tile,
- DestinationRect = new RelativeRect(0.25, 0.25, 0.5, 0.5, OriginUnit.Percent),
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ TileMode = TileMode.None,
+ SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+ DestinationRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
[Fact]
- public void VisualBrush_Tile_Alignment_BottomRight()
+ public void VisualBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest()
{
Decorator target = new Decorator
{
@@ -450,34 +309,23 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
Stretch = Stretch.None,
TileMode = TileMode.Tile,
- AlignmentX = AlignmentX.Right,
- AlignmentY = AlignmentY.Bottom,
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+ DestinationRect = new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "TileMode.FlipX not yet supported on cairo")]
+#else
[Fact]
- public void VisualBrush_FlipX()
+#endif
+ public void VisualBrush_NoStretch_FlipX_TopLeftDest()
{
Decorator target = new Decorator
{
@@ -490,33 +338,22 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
Stretch = Stretch.None,
TileMode = TileMode.FlipX,
- DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, OriginUnit.Percent),
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, RelativeUnit.Relative),
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "TileMode.FlipY not yet supported on cairo")]
+#else
[Fact]
- public void VisualBrush_FlipY()
+#endif
+ public void VisualBrush_NoStretch_FlipY_TopLeftDest()
{
Decorator target = new Decorator
{
@@ -529,33 +366,22 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
Stretch = Stretch.None,
TileMode = TileMode.FlipY,
- DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, OriginUnit.Percent),
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, RelativeUnit.Relative),
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
+#if PERSPEX_CAIRO
+ [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
[Fact]
- public void VisualBrush_FlipXY()
+#endif
+ public void VisualBrush_NoStretch_FlipXY_TopLeftDest()
{
Decorator target = new Decorator
{
@@ -568,29 +394,14 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
Stretch = Stretch.None,
TileMode = TileMode.FlipXY,
- DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, OriginUnit.Percent),
- Visual = new Border
- {
- Width = 92,
- Height = 92,
- Background = Brushes.Red,
- BorderBrush = Brushes.Black,
- BorderThickness = 2,
- Child = new TextBlock
- {
- Text = "Perspex",
- FontSize = 12,
- FontFamily = "Arial",
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- }
- }
+ DestinationRect = new RelativeRect(0, 0, 0.5, 0.5, RelativeUnit.Relative),
+ Visual = Visual,
}
}
};
- this.RenderToFile(target);
- this.CompareImages();
+ RenderToFile(target);
+ CompareImages();
}
}
}
diff --git a/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj b/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
index ffeb20949a..ac99be3bdf 100644
--- a/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
+++ b/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
@@ -1,5 +1,6 @@
+
@@ -8,8 +9,8 @@
{E106CF37-4066-4615-B684-172A6D30B058}
Library
Properties
- Perspex.Direct2D1.RenderTests
- Perspex.Direct2D1.RenderTests
+ Perspex.Cairo.RenderTests
+ Perspex.Cairo.RenderTests
v4.5
512
10.0
@@ -17,7 +18,8 @@
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
- 93023d49
+
+
true
@@ -32,38 +34,31 @@
pdbonly
true
bin\Release\
- TRACE
+ TRACE;PERSPEX_CAIRO
prompt
4
-
- ..\..\packages\Magick.NET-Q8-x86.7.0.0.0014\lib\net40-client\Magick.NET-x86.dll
- True
-
-
- ..\..\packages\Magick.NET-Q8-x86.7.0.0.0014\lib\net40-client\Magick.NET.Core.dll
- True
-
-
- ..\..\packages\Magick.NET-Q8-x86.7.0.0.0014\lib\net40-client\Magick.NET.Wrapper-x86.dll
- True
-
-
- ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
- ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
-
..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll
..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll
+
+ ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0018\lib\net40-client\Magick.NET-AnyCPU.dll
+
+
+ ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0018\lib\net40-client\Magick.NET.Core.dll
+
+
+ ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
+
+
+ ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
+
@@ -76,6 +71,9 @@
-
- {fb05ac90-89ba-4f2f-a924-f37875fb547c}
+
+ {FB05AC90-89BA-4F2F-A924-F37875FB547C}
Perspex.Cairo
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
+
+ {D211E587-D8BC-45B9-95A4-F297C8FA5200}
Perspex.Animation
-
- {b09b78d8-9b26-48b0-9149-d64a2f120f3f}
+
+ {B09B78D8-9B26-48B0-9149-D64A2F120F3F}
Perspex.Base
-
- {d2221c82-4a25-4583-9b43-d791e3f6820c}
+
+ {D2221C82-4A25-4583-9B43-D791E3F6820C}
Perspex.Controls
-
- {62024b2d-53eb-4638-b26b-85eeaa54866e}
+
+ {62024B2D-53EB-4638-B26B-85EEAA54866E}
Perspex.Input
-
- {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}
+
+ {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}
Perspex.Interactivity
-
- {42472427-4774-4c81-8aff-9f27b8e31721}
+
+ {42472427-4774-4C81-8AFF-9F27B8E31721}
Perspex.Layout
-
- {eb582467-6abb-43a1-b052-e981ba910e3a}
+
+ {EB582467-6ABB-43A1-B052-E981BA910E3A}
Perspex.SceneGraph
-
- {f1baa01a-f176-4c6a-b39d-5b40bb1b148f}
+
+ {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}
Perspex.Styling
@@ -152,7 +150,7 @@
This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.