From d582eecf28340025d523fc7ca654aa085a3c2a1c Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 2 Mar 2016 17:36:45 +0100 Subject: [PATCH] Fix TestApplication. --- samples/TestApplication/TestApplication.csproj | 8 ++++++++ samples/TestApplicationShared/App.cs | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/samples/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj index d87ec3cd93..56f7ff3b4c 100644 --- a/samples/TestApplication/TestApplication.csproj +++ b/samples/TestApplication/TestApplication.csproj @@ -86,6 +86,14 @@ {54f237d5-a70a-4752-9656-0c70b1a7b047} Perspex.Gtk + + {3e53a01a-b331-47f3-b828-4a5717e77a24} + Perspex.Markup.Xaml + + + {6417e941-21bc-467b-a771-0de389353ce6} + Perspex.Markup + {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation diff --git a/samples/TestApplicationShared/App.cs b/samples/TestApplicationShared/App.cs index da93faa528..f8f8996dcb 100644 --- a/samples/TestApplicationShared/App.cs +++ b/samples/TestApplicationShared/App.cs @@ -5,6 +5,7 @@ using System; using Perspex; using Perspex.Controls; using Perspex.Controls.Templates; +using Perspex.Markup.Xaml; using Perspex.Styling; using Perspex.Themes.Default; @@ -17,6 +18,12 @@ namespace TestApplication RegisterServices(); InitializeSubsystems((int)Environment.OSVersion.Platform); Styles.Add(new DefaultTheme()); + + var loader = new PerspexXamlLoader(); + var baseLight = (IStyle)loader.Load( + new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default")); + Styles.Add(baseLight); + Styles.Add(new SampleTabStyle()); DataTemplates = new DataTemplates {