diff --git a/support/hololens/ServoApp/Assets/UI/home.png b/support/hololens/ServoApp/Assets/UI/home.png new file mode 100644 index 00000000000..9d7ce16571b Binary files /dev/null and b/support/hololens/ServoApp/Assets/UI/home.png differ 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 @@ - - - + + + @@ -94,31 +94,34 @@ + - + 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 @@ + 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 @@ Assets\UI + + Assets\UI +