mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Auto merge of #24260 - paulrouget:miscUWP, r=jdm
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 -->
This commit is contained in:
commit
4fe8238b14
7 changed files with 12 additions and 2 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -58,4 +58,5 @@ support/hololens/ServoApp/support/
|
||||||
support/hololens/ServoApp/Debug/
|
support/hololens/ServoApp/Debug/
|
||||||
support/hololens/ServoApp/Release/
|
support/hololens/ServoApp/Release/
|
||||||
support/hololens/packages/
|
support/hololens/packages/
|
||||||
|
support/hololens/AppPackages/
|
||||||
support/hololens/.vs/
|
support/hololens/.vs/
|
||||||
|
|
|
@ -747,6 +747,7 @@ class MachCommands(CommandBase):
|
||||||
"support/hololens/ServoApp/Debug/",
|
"support/hololens/ServoApp/Debug/",
|
||||||
"support/hololens/ServoApp/Release/",
|
"support/hololens/ServoApp/Release/",
|
||||||
"support/hololens/packages/",
|
"support/hololens/packages/",
|
||||||
|
"support/hololens/AppPackages/",
|
||||||
]
|
]
|
||||||
|
|
||||||
for uwp_artifact in uwp_artifacts:
|
for uwp_artifact in uwp_artifacts:
|
||||||
|
|
3
support/hololens/ServoApp/DefaultUrl.h
Normal file
3
support/hololens/ServoApp/DefaultUrl.h
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define DEFAULT_URL L"about:blank";
|
|
@ -37,5 +37,7 @@
|
||||||
</Applications>
|
</Applications>
|
||||||
<Capabilities>
|
<Capabilities>
|
||||||
<Capability Name="internetClient" />
|
<Capability Name="internetClient" />
|
||||||
|
<Capability Name="codeGeneration" />
|
||||||
|
<Capability Name="privateNetworkClientServer" />
|
||||||
</Capabilities>
|
</Capabilities>
|
||||||
</Package>
|
</Package>
|
|
@ -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>
|
||||||
|
|
|
@ -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">
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue