Add browser control

bitbonk · May 18, 2019 · 1b4a212 · 1b4a212
1 parent 3d0ae5f
commit 1b4a212
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/ControlCatalog/App.xaml b/ControlCatalog/App.xaml
@@ -5,6 +5,7 @@
       <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
       <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
       <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
+      <StyleInclude Source="resm:CefGlue.Avalonia.AvaloniaCefBrowser.xaml?assembly=CefGlue.Avalonia"/>
     <Style Selector="TextBlock.h1">
       <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
       <Setter Property="FontWeight" Value="Medium"/>

diff --git a/ControlCatalog/ControlCatalog.csproj b/ControlCatalog/ControlCatalog.csproj
@@ -23,6 +23,9 @@
     <PackageReference Include="Avalonia" Version="0.8.1-cibuild0002425-beta" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.8.1-cibuild0002425-beta" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.8.1-cibuild0002425-beta" />
+    <PackageReference Include="VitalElement.CefGlue.Core" Version="0.9.0-build32-alpha" />
+    <PackageReference Include="VitalElement.CefGlue.Core.Avalonia" Version="0.9.0-build32-alpha" />
+    <PackageReference Include="VitalElement.CefGlue.Core.Win-x64" Version="0.9.0-build32-alpha" />
 
   </ItemGroup>
 </Project>
diff --git a/ControlCatalog/MainView.xaml b/ControlCatalog/MainView.xaml
@@ -30,7 +30,7 @@
       <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
       <TabItem Header="Menu"><pages:MenuPage/></TabItem>
       <TabItem Header="Notifications"><pages:NotificationsPage/></TabItem>
-	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
+      <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
       <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
       <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
       <TabItem Header="Slider"><pages:SliderPage/></TabItem>

diff --git a/ControlCatalog/MainView.xaml.cs b/ControlCatalog/MainView.xaml.cs
@@ -29,7 +29,16 @@ public MainView()
                     Header = "Screens",
                     Content = new ScreenPage()
                 });
-
+                tabItems.Add(new TabItem()
+                {
+                    Header = "3rd Party Controls",
+                    IsHitTestVisible = false
+                });
+                tabItems.Add(new TabItem()
+                {
+                    Header = "Browser",
+                    Content = new BrowserPage()
+                });
             }
 
             var light = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))

diff --git a/ControlCatalog/Pages/BrowserPage.xaml b/ControlCatalog/Pages/BrowserPage.xaml
@@ -0,0 +1,6 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:b="clr-namespace:CefGlue.Avalonia;assembly=CefGlue.Avalonia"
+             x:Class="ControlCatalog.Pages.BrowserPage">
+  <b:AvaloniaCefBrowser StartUrl="http://www.bing.com"></b:AvaloniaCefBrowser>
+</UserControl>
diff --git a/ControlCatalog/Pages/BrowserPage.xaml.cs b/ControlCatalog/Pages/BrowserPage.xaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class BrowserPage : UserControl
+    {
+        public BrowserPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}