aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-12-15 17:35:09 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-12-15 17:35:09 +0200
commitd92af8452acdde8595e16c379e8a17cd5d3efdbe (patch)
tree367ca670ea6234d4bbf0ba45ca4bb4e572b0fb68 /Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views
parent24292197223caf2ffa1a771c38b2e2f7418ad03e (diff)
downloadTango-d92af8452acdde8595e16c379e8a17cd5d3efdbe.tar.gz
Tango-d92af8452acdde8595e16c379e8a17cd5d3efdbe.zip
Added support for chromium touch enabled on PPC.
Implemented real Cef Installer.
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml5
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml.cs4
2 files changed, 7 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml
index 6e2076c98..ce28d660e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml
@@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:vm="clr-namespace:Tango.PPC.Browser.ViewModels"
xmlns:wpf="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
+ xmlns:experimental="clr-namespace:CefSharp.Wpf.Experimental;assembly=CefSharp.Wpf"
xmlns:global="clr-namespace:Tango.PPC.Browser"
xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
xmlns:keyboard="clr-namespace:Tango.Touch.Keyboard;assembly=Tango.Touch"
@@ -15,7 +16,7 @@
<DockPanel>
<Border DockPanel.Dock="Top" Padding="10" BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0 0 0 1" Visibility="{Binding DisplayAddressBar,Converter={StaticResource BooleanToVisibilityConverter}}">
<DockPanel>
- <touch:TouchButton Command="{Binding GoCommand}" DockPanel.Dock="Right" Padding="10" Width="150" CornerRadius="20" Margin="20 0 0 0">
+ <touch:TouchButton x:Name="btnGo" Command="{Binding GoCommand}" DockPanel.Dock="Right" Padding="10" Width="150" CornerRadius="20" Margin="20 0 0 0">
<touch:TouchIcon Icon="ArrowRightBold" Height="20" />
</touch:TouchButton>
<Grid>
@@ -54,7 +55,7 @@
</Border>
<Grid>
- <wpf:ChromiumWebBrowser x:Name="Browser" />
+ <experimental:ChromiumWebBrowserWithTouchSupport x:Name="Browser" />
<Grid Background="White" IsHitTestVisible="False" Visibility="Hidden" x:Name="gridError">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<touch:TouchIcon Icon="Alert" Foreground="{StaticResource TangoGrayTextBrush}" Width="100" Height="100" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml.cs
index cdba301ed..e7fe1ca27 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/Views/BrowserView.xaml.cs
@@ -34,6 +34,8 @@ namespace Tango.PPC.Browser.Views
{
public event EventHandler<string> AddressChanged;
+ public static BrowserView Instance { get; set; }
+
public BrowserView()
{
try
@@ -51,6 +53,8 @@ namespace Tango.PPC.Browser.Views
InitializeComponent();
+ Instance = this;
+
TangoIOC.Default.Register<IBrowserView>(this);
Helpers.BoundObjectsHelper.RegisterAllBoundObjects(Browser, Dispatcher);