Skip to content

Commit

Permalink
Auto merge of #24260 - paulrouget:miscUWP, r=jdm
Browse files Browse the repository at this point in the history
Some small UWP improvements

- isolate the default url in its own file. As we keep tweaking it.
- allow code generation and local network connections
- cleaning the newly introduce AppPackages directory

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24260)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Sep 21, 2019
2 parents de89b09 + 3e4cac3 commit 5d8942d
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -58,4 +58,5 @@ support/hololens/ServoApp/support/
support/hololens/ServoApp/Debug/
support/hololens/ServoApp/Release/
support/hololens/packages/
support/hololens/AppPackages/
support/hololens/.vs/
1 change: 1 addition & 0 deletions python/servo/build_commands.py
Expand Up @@ -747,6 +747,7 @@ def clean(self, manifest_path=None, params=[], verbose=False):
"support/hololens/ServoApp/Debug/",
"support/hololens/ServoApp/Release/",
"support/hololens/packages/",
"support/hololens/AppPackages/",
]

for uwp_artifact in uwp_artifacts:
Expand Down
3 changes: 3 additions & 0 deletions support/hololens/ServoApp/DefaultUrl.h
@@ -0,0 +1,3 @@
#pragma once

#define DEFAULT_URL L"about:blank";
2 changes: 2 additions & 0 deletions support/hololens/ServoApp/Package.appxmanifest
Expand Up @@ -37,5 +37,7 @@
</Applications>
<Capabilities>
<Capability Name="internetClient" />
<Capability Name="codeGeneration" />
<Capability Name="privateNetworkClientServer" />
</Capabilities>
</Package>
3 changes: 2 additions & 1 deletion support/hololens/ServoApp/ServoApp.vcxproj
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
1 change: 1 addition & 0 deletions support/hololens/ServoApp/ServoApp.vcxproj.filters
Expand Up @@ -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">
Expand Down
3 changes: 2 additions & 1 deletion support/hololens/ServoApp/ServoControl/ServoControl.h
Expand Up @@ -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 {
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 5d8942d

Please sign in to comment.