Skip to content

Commit 79df9e4

Browse files
committed
fix: uwb not running in windows editor when targeting android and ios
1 parent e98f7e7 commit 79df9e4

31 files changed

+35
-65
lines changed

sample/Assets/Scenes/SelectAuthMethod.unity

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,8 +1673,8 @@ RectTransform:
16731673
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16741674
m_AnchorMin: {x: 0, y: 0}
16751675
m_AnchorMax: {x: 0, y: 0}
1676-
m_AnchoredPosition: {x: 1155.9412, y: 0}
1677-
m_SizeDelta: {x: 2271.8823, y: 0}
1676+
m_AnchoredPosition: {x: 1094.8243, y: 0}
1677+
m_SizeDelta: {x: 2149.6487, y: 0}
16781678
m_Pivot: {x: 0.5, y: 0.5}
16791679
--- !u!114 &1661390145
16801680
MonoBehaviour:
@@ -1768,8 +1768,8 @@ RectTransform:
17681768
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17691769
m_AnchorMin: {x: 0, y: 0}
17701770
m_AnchorMax: {x: 0, y: 0}
1771-
m_AnchoredPosition: {x: 1155.9412, y: 0}
1772-
m_SizeDelta: {x: 2271.8823, y: 0}
1771+
m_AnchoredPosition: {x: 1094.8243, y: 0}
1772+
m_SizeDelta: {x: 2149.6487, y: 0}
17731773
m_Pivot: {x: 0.5, y: 0.5}
17741774
--- !u!114 &1688502349
17751775
MonoBehaviour:

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Plugins/VoltstroStudios.UnityWebBrowser.Shared.dll.meta

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
22

3-
// UnityWebBrowser (UWB)
3+
// UnityWebBrowser (UWB)
44
// Copyright (c) 2021-2022 Voltstro-Studios
55
//
66
// This project is under the MIT license. See the LICENSE.md file for more details.

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Core/Engines/EngineConfiguration.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ public class EngineConfiguration : Engine
3131

3232
public override string GetEngineExecutableName()
3333
{
34-
#if UNITY_STANDALONE_WIN
3534
return engineAppName + ".exe";
36-
#else
37-
return engineAppName;
38-
#endif
3935
}
4036

4137
[Obsolete]

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Core/Engines/EngineProcess.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
22

3-
// UnityWebBrowser (UWB)
3+
// UnityWebBrowser (UWB)
44
// Copyright (c) 2021-2024 Voltstro-Studios
55
//
66
// This project is under the MIT license. See the LICENSE.md file for more details.
@@ -31,13 +31,7 @@ internal sealed class EngineProcess : IDisposable
3131
/// <param name="logger"></param>
3232
public EngineProcess(Engine engine, IWebBrowserLogger logger)
3333
{
34-
#if UNITY_STANDALONE_WIN
3534
processHandle = new WindowProcess();
36-
#elif UNITY_STANDALONE_LINUX
37-
processHandle = new LinuxProcess(logger);
38-
#elif UNITY_STANDALONE_OSX
39-
processHandle = new MacOsProcess();
40-
#endif
4135

4236
this.engine = engine;
4337
this.logger = logger;

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Core/Engines/Process/IProcess.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
22

3-
// UnityWebBrowser (UWB)
3+
// UnityWebBrowser (UWB)
44
// Copyright (c) 2021-2024 Voltstro-Studios
55
//
66
// This project is under the MIT license. See the LICENSE.md file for more details.

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Core/Engines/Process/LinuxProcess.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
22

3-
// UnityWebBrowser (UWB)
3+
// UnityWebBrowser (UWB)
44
// Copyright (c) 2021-2024 Voltstro-Studios
55
//
66
// This project is under the MIT license. See the LICENSE.md file for more details.

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Core/Engines/Process/WindowProcess.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
22

3-
// UnityWebBrowser (UWB)
3+
// UnityWebBrowser (UWB)
44
// Copyright (c) 2021-2024 Voltstro-Studios
55
//
66
// This project is under the MIT license. See the LICENSE.md file for more details.
77

8-
#if UNITY_STANDALONE_WIN
9-
108
using System;
119
using System.ComponentModel;
1210
using System.Diagnostics;
@@ -168,6 +166,4 @@ public struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
168166
}
169167
}
170168

171-
#endif
172-
173169
#endif

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Core/Js/InvalidArgumentsException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
22

3-
// UnityWebBrowser (UWB)
3+
// UnityWebBrowser (UWB)
44
// Copyright (c) 2021-2024 Voltstro-Studios
55
//
66
// This project is under the MIT license. See the LICENSE.md file for more details.

src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/[email protected]/Runtime/Core/Js/JsMethodManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#if !IMMUTABLE_CUSTOM_BROWSER && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN))
22

3-
// UnityWebBrowser (UWB)
3+
// UnityWebBrowser (UWB)
44
// Copyright (c) 2021-2024 Voltstro-Studios
55
//
66
// This project is under the MIT license. See the LICENSE.md file for more details.

0 commit comments

Comments
 (0)