Isolate default URL in its own file, for convenience

servo · Sep 21, 2019 · 4490b2d · 4490b2d
1 parent 748fa72
commit 4490b2d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/support/hololens/ServoApp/DefaultUrl.h 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
@@ -128,6 +128,7 @@
     <ClInclude Include="ServoControl\OpenGLES.h" />
     <ClInclude Include="ServoControl\Servo.h" />
     <ClInclude Include="ServoControl\ServoControl.h" />
+    <ClInclude Include="DefaultUrl.h" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -981,4 +982,4 @@
     <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props'))" />
     <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -37,6 +37,7 @@
     <ClInclude Include="ServoControl\ServoControl.h">
       <Filter>ServoControl</Filter>
     </ClInclude>
+    <ClInclude Include="DefaultUrl.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\Wide310x150Logo.scale-200.png">

diff --git 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<ServoControl>, public servo::ServoDelegate {
@@ -95,7 +96,7 @@ struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
   winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent;
 
   float mDPI = 1;
-  hstring mInitialURL = L"about:blank";
+  hstring mInitialURL = DEFAULT_URL;
   bool mTransient = false;
 
   Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();