From 193113037d49d0de13adc1042a6a65a016a8515b Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Wed, 4 Dec 2019 08:08:08 +0100
Subject: [PATCH] Home button and larger buttons in toolbar

---
 support/hololens/ServoApp/Assets/UI/home.png  | Bin 0 -> 2038 bytes
 support/hololens/ServoApp/BrowserPage.cpp     |   6 ++++++
 support/hololens/ServoApp/BrowserPage.h       |   2 ++
 support/hololens/ServoApp/BrowserPage.xaml    |  19 ++++++++++--------
 support/hololens/ServoApp/DefaultUrl.h        |   2 +-
 support/hololens/ServoApp/ServoApp.vcxproj    |   1 +
 .../ServoApp/ServoApp.vcxproj.filters         |   3 +++
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 support/hololens/ServoApp/Assets/UI/home.png

diff --git a/support/hololens/ServoApp/Assets/UI/home.png b/support/hololens/ServoApp/Assets/UI/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d7ce16571b6762e5b5fb65e25436298633a3885
GIT binary patch
literal 2038
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
bqN3>$CpiD#0L@_i^?m`oizlug8<g~KW0G(u

literal 0
HcmV?d00001

diff --git a/support/hololens/ServoApp/BrowserPage.cpp b/support/hololens/ServoApp/BrowserPage.cpp
index 2cf98b7452b..b940d42019c 100644
--- a/support/hololens/ServoApp/BrowserPage.cpp
+++ b/support/hololens/ServoApp/BrowserPage.cpp
@@ -6,6 +6,7 @@
 #include "logs.h"
 #include "BrowserPage.h"
 #include "BrowserPage.g.cpp"
+#include "DefaultUrl.h"
 
 using namespace std::placeholders;
 using namespace winrt::Windows::Foundation;
@@ -127,6 +128,11 @@ void BrowserPage::OnStopButtonClicked(IInspectable const &,
   servoControl().Stop();
 }
 
+void BrowserPage::OnHomeButtonClicked(IInspectable const &,
+                                      RoutedEventArgs const &) {
+  servoControl().LoadURIOrSearch(DEFAULT_URL);
+}
+
 void BrowserPage::OnURLEdited(IInspectable const &,
                               Input::KeyRoutedEventArgs const &e) {
   if (e.Key() == Windows::System::VirtualKey::Enter) {
diff --git a/support/hololens/ServoApp/BrowserPage.h b/support/hololens/ServoApp/BrowserPage.h
index f4585fd8321..f5fe8b3566b 100644
--- a/support/hololens/ServoApp/BrowserPage.h
+++ b/support/hololens/ServoApp/BrowserPage.h
@@ -25,6 +25,8 @@ public:
                              Windows::UI::Xaml::RoutedEventArgs const &);
   void OnStopButtonClicked(Windows::Foundation::IInspectable const &,
                            Windows::UI::Xaml::RoutedEventArgs const &);
+  void OnHomeButtonClicked(Windows::Foundation::IInspectable const &,
+                           Windows::UI::Xaml::RoutedEventArgs const &);
   void OnURLEdited(Windows::Foundation::IInspectable const &,
                    Windows::UI::Xaml::Input::KeyRoutedEventArgs const &);
   void OnURLFocused(Windows::Foundation::IInspectable const &);
diff --git a/support/hololens/ServoApp/BrowserPage.xaml b/support/hololens/ServoApp/BrowserPage.xaml
index 9990c0dab6c..c0b2839da7d 100644
--- a/support/hololens/ServoApp/BrowserPage.xaml
+++ b/support/hololens/ServoApp/BrowserPage.xaml
@@ -14,9 +14,9 @@
             <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}"/>
             <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}"/>
             <Setter Property="Padding" Value="0"/>
-            <Setter Property="Margin" Value="10,2"/>
-            <Setter Property="MinWidth" Value="30"/>
-            <Setter Property="MinHeight" Value="30"/>
+            <Setter Property="Margin" Value="5,0"/>
+            <Setter Property="MinWidth" Value="40"/>
+            <Setter Property="MinHeight" Value="40"/>
             <Setter Property="HorizontalAlignment" Value="Center"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
             <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
@@ -94,31 +94,34 @@
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" Grid.Column="0">
                 <Button Style="{StaticResource NavigationBarButton}" x:Name="backButton" IsTabStop="true" IsEnabled="false" Click="OnBackButtonClicked" AutomationProperties.Name="Back" ToolTipService.ToolTip="Back">
-                    <Image Source="Assets/UI/back.png" Height="12"></Image>
+                    <Image Source="Assets/UI/back.png" Height="18"></Image>
                     <Button.KeyboardAccelerators>
                         <KeyboardAccelerator Key="Left" Modifiers="Menu" />
                     </Button.KeyboardAccelerators>
                 </Button>
                 <Button Style="{StaticResource NavigationBarButton}" x:Name="forwardButton" IsTabStop="true" IsEnabled="false" Click="OnForwardButtonClicked" AutomationProperties.Name="Forward" ToolTipService.ToolTip="Forward">
-                    <Image Source="Assets/UI/forward.png" Height="12"></Image>
+                    <Image Source="Assets/UI/forward.png" Height="18"></Image>
                     <Button.KeyboardAccelerators>
                         <KeyboardAccelerator Key="Right" Modifiers="Menu" />
                     </Button.KeyboardAccelerators>
                 </Button>
                 <Button Style="{StaticResource NavigationBarButton}" x:Name="reloadButton" IsTabStop="true" IsEnabled="false" Visibility="Visible" Click="OnReloadButtonClicked" AutomationProperties.Name="Reload" ToolTipService.ToolTip="Reload">
-                    <Image Source="Assets/UI/reload.png" Height="12"></Image>
+                    <Image Source="Assets/UI/reload.png" Height="18"></Image>
                     <Button.KeyboardAccelerators>
                         <KeyboardAccelerator Key="R" Modifiers="Control" />
                     </Button.KeyboardAccelerators>
                 </Button>
                 <Button Style="{StaticResource NavigationBarButton}" x:Name="stopButton" IsTabStop="true" IsEnabled="false" Visibility="Collapsed" Click="OnStopButtonClicked" AutomationProperties.Name="Stop" ToolTipService.ToolTip="Stop">
-                    <Image Source="Assets/UI/stop.png" Height="12"></Image>
+                    <Image Source="Assets/UI/stop.png" Height="18"></Image>
                     <Button.KeyboardAccelerators>
                         <KeyboardAccelerator Key="Escape" Modifiers="None" />
                     </Button.KeyboardAccelerators>
                 </Button>
+                <Button Style="{StaticResource NavigationBarButton}" x:Name="homeButton" IsTabStop="true" Click="OnHomeButtonClicked" AutomationProperties.Name="Home" ToolTipService.ToolTip="Home">
+                    <Image Source="Assets/UI/home.png" Height="18"></Image>
+                </Button>
             </StackPanel>
-            <TextBox Text="" IsTabStop="true" InputScope="Url" PlaceholderText="Type a URL" x:Name="urlTextbox" Grid.Column="1" KeyUp="OnURLEdited" IsSpellCheckEnabled="False" Margin="3,0" KeyboardAcceleratorPlacementMode="Hidden">
+            <TextBox Text="" IsTabStop="true" InputScope="Url" PlaceholderText="Type a URL" x:Name="urlTextbox" VerticalAlignment="Center" Grid.Column="1" KeyUp="OnURLEdited" IsSpellCheckEnabled="False" Margin="3,0" KeyboardAcceleratorPlacementMode="Hidden">
                 <TextBox.KeyboardAccelerators>
                     <KeyboardAccelerator Key="L" Modifiers="Control" Invoked="OnURLKeyboardAccelerator"/>
                 </TextBox.KeyboardAccelerators>
diff --git a/support/hololens/ServoApp/DefaultUrl.h b/support/hololens/ServoApp/DefaultUrl.h
index 3a586fcb4dc..35fbe247930 100644
--- a/support/hololens/ServoApp/DefaultUrl.h
+++ b/support/hololens/ServoApp/DefaultUrl.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define DEFAULT_URL L"https://servo.org/hl-home/";
+#define DEFAULT_URL L"https://servo.org/hl-home/"
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index e3869ca1f97..f752011dff0 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -908,6 +908,7 @@
     <Image Include="Assets\StoreLogo.scale-400.png" />
     <Image Include="Assets\UI\back.png" />
     <Image Include="Assets\UI\forward.png" />
+    <Image Include="Assets\UI\home.png" />
     <Image Include="Assets\UI\reload.png" />
     <Image Include="Assets\UI\stop.png" />
     <Image Include="Assets\Wide310x150Logo.scale-100.png" />
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index 06630e046af..3cf5c9555d5 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -153,6 +153,9 @@
     <Image Include="Assets\UI\stop.png">
       <Filter>Assets\UI</Filter>
     </Image>
+    <Image Include="Assets\UI\home.png">
+      <Filter>Assets\UI</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />