From 4490b2de9acf398ca9b13a4c3ac8a68619daef54 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Fri, 20 Sep 2019 08:03:53 +0200 Subject: [PATCH] Isolate default URL in its own file, for convenience --- support/hololens/ServoApp/DefaultUrl.h | 3 +++ support/hololens/ServoApp/ServoApp.vcxproj | 3 ++- support/hololens/ServoApp/ServoApp.vcxproj.filters | 1 + support/hololens/ServoApp/ServoControl/ServoControl.h | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 support/hololens/ServoApp/DefaultUrl.h diff --git a/support/hololens/ServoApp/DefaultUrl.h b/support/hololens/ServoApp/DefaultUrl.h new file mode 100644 index 00000000000..359a7962dbd --- /dev/null +++ b/support/hololens/ServoApp/DefaultUrl.h @@ -0,0 +1,3 @@ +#pragma once + +#define DEFAULT_URL L"about:blank"; diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 201c4955edf..ad16700df6b 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -128,6 +128,7 @@ + @@ -981,4 +982,4 @@ - \ No newline at end of file + diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters index d4f1f4a9de7..73859388feb 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj.filters +++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters @@ -37,6 +37,7 @@ ServoControl + diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h index 9c38cec5efb..e13e3b0c69b 100644 --- a/support/hololens/ServoApp/ServoControl/ServoControl.h +++ b/support/hololens/ServoApp/ServoControl/ServoControl.h @@ -2,6 +2,7 @@ #include "ServoControl.g.h" #include "OpenGLES.h" #include "Servo.h" +#include "DefaultUrl.h" namespace winrt::ServoApp::implementation { struct ServoControl : ServoControlT, public servo::ServoDelegate { @@ -95,7 +96,7 @@ private: winrt::event mOnCaptureGesturesEndedEvent; float mDPI = 1; - hstring mInitialURL = L"about:blank"; + hstring mInitialURL = DEFAULT_URL; bool mTransient = false; Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();