Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Isolate default URL in its own file, for convenience

Browse source
This commit is contained in:
Paul Rouget 2019-09-20 08:03:53 +02:00
parent 748fa72320
commit 4490b2de9a
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
support/hololens/ServoApp/DefaultUrl.h Normal file
View file

@ -0,0 +1,3 @@
#pragma once
#define DEFAULT_URL L"about:blank";

3
support/hololens/ServoApp/ServoApp.vcxproj
View file

@ -128,6 +128,7 @@
<ClInclude Include="ServoControl\OpenGLES.h" /> <ClInclude Include="ServoControl\OpenGLES.h" />
<ClInclude Include="ServoControl\Servo.h" /> <ClInclude Include="ServoControl\Servo.h" />
<ClInclude Include="ServoControl\ServoControl.h" /> <ClInclude Include="ServoControl\ServoControl.h" />
<ClInclude Include="DefaultUrl.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ApplicationDefinition Include="App.xaml"> <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.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'))" /> <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> </Target>
</Project> </Project>

1
support/hololens/ServoApp/ServoApp.vcxproj.filters
View file

@ -37,6 +37,7 @@
<ClInclude Include="ServoControl\ServoControl.h"> <ClInclude Include="ServoControl\ServoControl.h">
<Filter>ServoControl</Filter> <Filter>ServoControl</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="DefaultUrl.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Assets\Wide310x150Logo.scale-200.png"> <Image Include="Assets\Wide310x150Logo.scale-200.png">

3
support/hololens/ServoApp/ServoControl/ServoControl.h
View file

@ -2,6 +2,7 @@
#include "ServoControl.g.h" #include "ServoControl.g.h"
#include "OpenGLES.h" #include "OpenGLES.h"
#include "Servo.h" #include "Servo.h"
#include "DefaultUrl.h"
namespace winrt::ServoApp::implementation { namespace winrt::ServoApp::implementation {
struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate { struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
@ -95,7 +96,7 @@ private:
winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent; winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent;
float mDPI = 1; float mDPI = 1;
hstring mInitialURL = L"about:blank"; hstring mInitialURL = DEFAULT_URL;
bool mTransient = false; bool mTransient = false;
Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel(); Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();