Skip to content

fixed Build Window layout in 2018.2+ #2948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 26, 2018
Merged

fixed Build Window layout in 2018.2+ #2948

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9759f6
fixed Build Window layout in 2018.2+
StephenHodgson Oct 20, 2018
d4a4c75
spelling
keveleigh Oct 22, 2018
b0eb6a1
cleaned up USBListener a bit
StephenHodgson Oct 23, 2018
e86d7f9
Better editor logging for device portal
StephenHodgson Oct 26, 2018
0c39e15
dots
StephenHodgson Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 61 additions & 84 deletions ...ities/BuildAndDeploy/BuildDeployWindow.cs → ...es/BuildAndDeploy/UwpBuildDeployWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Utilities.Build
/// Build window - supports SLN creation, APPX from SLN, Deploy on device, and misc helper utilities associated with the build/deploy/test iteration loop
/// Requires the device to be set in developer mode and to have secure connections disabled (in the security tab in the device portal)
/// </summary>
public class BuildDeployWindow : EditorWindow
public class UwpBuildDeployWindow : EditorWindow
{
#region Internal Types

Expand Down Expand Up @@ -77,7 +77,7 @@ private enum BuildPlatformEnum

private readonly GUIContent buildDirectoryLabel = new GUIContent("Build Directory", "It's recommended to use 'UWP'");

private readonly GUIContent useCSharpProjectsLabel = new GUIContent("Unity C# Projects", "Generate C# Project References for debugging");
private readonly GUIContent useCSharpProjectsLabel = new GUIContent("Generate C# Debug", "Generate C# Project References for debugging.\nOnly available in .NET Scripting runtime.");

private readonly GUIContent autoIncrementLabel = new GUIContent("Auto Increment", "Increases Version Build Number");

Expand Down Expand Up @@ -161,8 +161,7 @@ private static bool IsHoloLensConnectedUsb

#region Fields

private int halfWidth;
private int quarterWidth;
private const float HalfWidth = 256f;

private float timeLastUpdatedBuilds;

Expand All @@ -189,7 +188,7 @@ private static bool IsHoloLensConnectedUsb
public static void OpenWindow()
{
// Dock it next to the Scene View.
var window = GetWindow<BuildDeployWindow>(typeof(SceneView));
var window = GetWindow<UwpBuildDeployWindow>(typeof(SceneView));
window.titleContent = new GUIContent("Build Window");
window.Show();
}
Expand Down Expand Up @@ -225,9 +224,6 @@ private void Setup()

private void OnGUI()
{
quarterWidth = Screen.width / 4;
halfWidth = Screen.width / 2;

#region Quick Options

if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.WSAPlayer)
Expand All @@ -249,14 +245,14 @@ private void OnGUI()

GUI.enabled = Directory.Exists(BuildDeployPreferences.AbsoluteBuildDirectory);

if (GUILayout.Button("Open Build Directory", GUILayout.Width(quarterWidth)))
if (GUILayout.Button("Open Build Directory"))
{
EditorApplication.delayCall += () => Process.Start(BuildDeployPreferences.AbsoluteBuildDirectory);
}

GUI.enabled = true;

if (GUILayout.Button("Open Player Settings", GUILayout.Width(quarterWidth)))
if (GUILayout.Button("Open Player Settings"))
{
EditorApplication.ExecuteMenuItem("Edit/Project Settings/Player");
}
Expand All @@ -283,14 +279,14 @@ private void OnGUI()
GUI.enabled = ShouldBuildSLNBeEnabled;

// Build & Run button...
if (GUILayout.Button(CanInstall ? buildAllThenInstallLabel : buildAllLabel, GUILayout.Width(halfWidth - 20)))
if (GUILayout.Button(CanInstall ? buildAllThenInstallLabel : buildAllLabel, GUILayout.Width(HalfWidth), GUILayout.ExpandWidth(true)))
{
EditorApplication.delayCall += () => BuildAll(canInstall);
}

GUI.enabled = true;

if (GUILayout.Button("Open Player Settings", GUILayout.Width(quarterWidth)))
if (GUILayout.Button("Open Player Settings"))
{
EditorApplication.ExecuteMenuItem("Edit/Project Settings/Player");
}
Expand Down Expand Up @@ -349,7 +345,7 @@ private void UnityBuildGUI()

GUI.enabled = Directory.Exists(BuildDeployPreferences.AbsoluteBuildDirectory);

if (GUILayout.Button("Open Build Directory", GUILayout.Width(halfWidth)))
if (GUILayout.Button("Open Build Directory", GUILayout.Width(HalfWidth)))
{
EditorApplication.delayCall += () => Process.Start(BuildDeployPreferences.AbsoluteBuildDirectory);
}
Expand All @@ -358,11 +354,26 @@ private void UnityBuildGUI()

EditorGUILayout.EndHorizontal();
EditorGUILayout.BeginHorizontal();

// Generate C# Project References for debugging
bool generateReferenceProjects = EditorUserBuildSettings.wsaGenerateReferenceProjects;

var curScriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA);

GUI.enabled = curScriptingBackend == ScriptingImplementation.WinRTDotNET;
bool shouldGenerateProjects = EditorGUILayout.Toggle(useCSharpProjectsLabel, generateReferenceProjects);
GUI.enabled = true;

if (shouldGenerateProjects != generateReferenceProjects)
{
EditorUserBuildSettings.wsaGenerateReferenceProjects = shouldGenerateProjects;
}

GUILayout.FlexibleSpace();

GUI.enabled = ShouldOpenSLNBeEnabled;

if (GUILayout.Button("Open in Visual Studio", GUILayout.Width(halfWidth)))
if (GUILayout.Button("Open in Visual Studio", GUILayout.Width(HalfWidth)))
{
// Open SLN
string slnFilename = Path.Combine(BuildDeployPreferences.BuildDirectory, $"{PlayerSettings.productName}.sln");
Expand All @@ -381,40 +392,24 @@ private void UnityBuildGUI()
}

EditorGUILayout.EndHorizontal();
EditorGUILayout.BeginHorizontal();

// Generate C# Project References for debugging
GUILayout.FlexibleSpace();
var previousLabelWidth = EditorGUIUtility.labelWidth;
EditorGUIUtility.labelWidth = 105;
bool generateReferenceProjects = EditorUserBuildSettings.wsaGenerateReferenceProjects;
bool shouldGenerateProjects = EditorGUILayout.Toggle(useCSharpProjectsLabel, generateReferenceProjects);

if (shouldGenerateProjects != generateReferenceProjects)
{
EditorUserBuildSettings.wsaGenerateReferenceProjects = shouldGenerateProjects;
}

EditorGUIUtility.labelWidth = previousLabelWidth;
EditorGUILayout.Space();

// Build Unity Player
GUI.enabled = ShouldBuildSLNBeEnabled;

if (GUILayout.Button("Build Unity Project", GUILayout.Width(halfWidth)))
if (GUILayout.Button("Build Unity Project"))
{
EditorApplication.delayCall += BuildUnityProject;
}

GUI.enabled = true;

EditorGUILayout.EndHorizontal();
EditorGUILayout.EndVertical();
}

private void AppxBuildGUI()
{
GUILayout.BeginVertical();
GUILayout.BeginHorizontal();

// SDK and MS Build Version(and save setting, if it's changed)
string currentSDKVersion = EditorUserBuildSettings.wsaUWPSDK;
Expand All @@ -436,7 +431,7 @@ private void AppxBuildGUI()
}
}

EditorGUILayout.LabelField("Required SDK Version: " + SdkVersion, GUILayout.Width(halfWidth - 16));
EditorGUILayout.HelpBox("Required SDK Version: " + SdkVersion, MessageType.Info);

// Throw exception if user has no Windows 10 SDK installed
if (currentSDKVersionIndex < 0)
Expand All @@ -446,7 +441,6 @@ private void AppxBuildGUI()
Debug.LogError($"Unable to find the required Windows 10 SDK Target!\nPlease be sure to install the {SdkVersion} SDK from Visual Studio Installer.");
}

GUILayout.EndHorizontal();
EditorGUILayout.HelpBox($"Unable to find the required Windows 10 SDK Target!\nPlease be sure to install the {SdkVersion} SDK from Visual Studio Installer.", MessageType.Error);
GUILayout.EndVertical();
IsValidSdkInstalled = false;
Expand All @@ -460,17 +454,9 @@ private void AppxBuildGUI()
if (curScriptingBackend == ScriptingImplementation.WinRTDotNET)
{
EditorGUILayout.HelpBox(".NET Scripting backend is depreciated, please use IL2CPP.", MessageType.Warning);
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();
}

var newScriptingBackend = (ScriptingImplementation)EditorGUILayout.IntPopup(
"Scripting Backend",
(int)curScriptingBackend,
scriptingBackendNames,
scriptingBackendEnum,
GUILayout.Width(halfWidth));
var newScriptingBackend = (ScriptingImplementation)EditorGUILayout.IntPopup("Scripting Backend", (int)curScriptingBackend, scriptingBackendNames, scriptingBackendEnum, GUILayout.Width(HalfWidth));

if (newScriptingBackend != curScriptingBackend)
{
Expand Down Expand Up @@ -498,10 +484,6 @@ private void AppxBuildGUI()
EditorUserBuildSettings.wsaUWPSDK = newSDKVersion;
}

GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();

// Build config (and save setting, if it's changed)
string curBuildConfigString = BuildDeployPreferences.BuildConfig;

Expand All @@ -520,7 +502,7 @@ private void AppxBuildGUI()
}

EditorUserBuildSettings.GetWSADotNetNative(buildConfigOption);
buildConfigOption = (WSABuildType)EditorGUILayout.EnumPopup("Build Configuration", buildConfigOption, GUILayout.Width(halfWidth));
buildConfigOption = (WSABuildType)EditorGUILayout.EnumPopup("Build Configuration", buildConfigOption, GUILayout.Width(HalfWidth));

string buildConfigString = buildConfigOption.ToString();

Expand All @@ -529,10 +511,6 @@ private void AppxBuildGUI()
BuildDeployPreferences.BuildConfig = buildConfigString;
}

GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();

// Build Platform (and save setting, if it's changed)
string curBuildPlatformString = BuildDeployPreferences.BuildPlatform;
var buildPlatformOption = BuildPlatformEnum.x86;
Expand All @@ -546,7 +524,7 @@ private void AppxBuildGUI()
buildPlatformOption = BuildPlatformEnum.x64;
}

buildPlatformOption = (BuildPlatformEnum)EditorGUILayout.EnumPopup("Build Platform", buildPlatformOption, GUILayout.Width(halfWidth));
buildPlatformOption = (BuildPlatformEnum)EditorGUILayout.EnumPopup("Build Platform", buildPlatformOption, GUILayout.Width(HalfWidth));

string newBuildPlatformString;

Expand All @@ -565,9 +543,7 @@ private void AppxBuildGUI()
BuildDeployPreferences.BuildPlatform = newBuildPlatformString;
}

GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();

var previousLabelWidth = EditorGUIUtility.labelWidth;

Expand All @@ -589,17 +565,33 @@ private void AppxBuildGUI()

EditorGUI.BeginChangeCheck();

newVersion.x = EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Major, GUILayout.Width(quarterWidth / 2 - 3));
newVersion.y = EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Minor, GUILayout.Width(quarterWidth / 2 - 3));
newVersion.z = EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Build, GUILayout.Width(quarterWidth / 2 - 3));
newVersion.x = EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Major);
newVersion.y = EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Minor);
newVersion.z = EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Build);

if (EditorGUI.EndChangeCheck())
{
PlayerSettings.WSA.packageVersion = new Version((int)newVersion.x, (int)newVersion.y, (int)newVersion.z, 0);
}

GUI.enabled = false;
EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Revision, GUILayout.Width(quarterWidth / 2 - 3));
EditorGUILayout.IntField(PlayerSettings.WSA.packageVersion.Revision);
GUI.enabled = true;

GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();

// Open AppX packages location
string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? $"/AppPackages/{PlayerSettings.productName}" : $"/{PlayerSettings.productName}/AppPackages";
string appxBuildPath = Path.GetFullPath($"{BuildDeployPreferences.BuildDirectory}{appxDirectory}");
GUI.enabled = builds.Count > 0 && !string.IsNullOrEmpty(appxBuildPath);

if (GUILayout.Button("Open APPX Packages Location", GUILayout.Width(HalfWidth)))
{
EditorApplication.delayCall += () => Process.Start("explorer.exe", $"/f /open,{appxBuildPath}");
}

GUI.enabled = true;

GUILayout.EndHorizontal();
Expand All @@ -623,7 +615,7 @@ private void AppxBuildGUI()
// Build APPX
GUI.enabled = ShouldBuildAppxBeEnabled;

if (GUILayout.Button("Build APPX", GUILayout.Width(halfWidth)))
if (GUILayout.Button("Build APPX", GUILayout.Width(HalfWidth)))
{
// Check if solution exists
string slnFilename = Path.Combine(BuildDeployPreferences.BuildDirectory, $"{PlayerSettings.productName}.sln");
Expand All @@ -640,22 +632,6 @@ private void AppxBuildGUI()
GUI.enabled = true;
}

GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();

// Open AppX packages location
string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? $"/AppPackages/{PlayerSettings.productName}" : $"/{PlayerSettings.productName}/AppPackages";
string appxBuildPath = Path.GetFullPath($"{BuildDeployPreferences.BuildDirectory}{appxDirectory}");
GUI.enabled = builds.Count > 0 && !string.IsNullOrEmpty(appxBuildPath);

if (GUILayout.Button("Open APPX Packages Location", GUILayout.Width(halfWidth)))
{
EditorApplication.delayCall += () => Process.Start("explorer.exe", $"/f /open,{appxBuildPath}");
}

GUI.enabled = true;

GUILayout.EndHorizontal();
GUILayout.EndVertical();
}
Expand All @@ -664,6 +640,7 @@ private void DeployGUI()
{
Debug.Assert(portalConnections.Connections.Count != 0);
Debug.Assert(currentConnectionInfoIndex >= 0);

if (currentConnectionInfoIndex > portalConnections.Connections.Count - 1)
{
currentConnectionInfoIndex = 0;
Expand All @@ -675,7 +652,7 @@ private void DeployGUI()

GUI.enabled = IsHoloLensConnectedUsb;

if (GUILayout.Button(pairHoloLensUsbLabel, GUILayout.Width(quarterWidth)))
if (GUILayout.Button(pairHoloLensUsbLabel, GUILayout.Width(128f)))
{
EditorApplication.delayCall += PairDevice;
}
Expand All @@ -689,7 +666,7 @@ private void DeployGUI()
bool useSSL = EditorGUILayout.Toggle(useSSLLabel, BuildDeployPreferences.UseSSL);
EditorGUIUtility.labelWidth = previousLabelWidth;

currentConnectionInfoIndex = EditorGUILayout.Popup(currentConnectionInfoIndex, targetIps, GUILayout.Width(halfWidth - 48));
currentConnectionInfoIndex = EditorGUILayout.Popup(currentConnectionInfoIndex, targetIps);

var currentConnection = portalConnections.Connections[currentConnectionInfoIndex];
bool currentConnectionIsLocal = IsLocalConnection(currentConnection);
Expand Down Expand Up @@ -726,7 +703,7 @@ private void DeployGUI()
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();

GUILayout.Label(currentConnection.MachineName, GUILayout.Width(halfWidth));
GUILayout.Label(currentConnection.MachineName, GUILayout.Width(HalfWidth));

GUILayout.EndHorizontal();

Expand All @@ -736,17 +713,17 @@ private void DeployGUI()
GUILayout.FlexibleSpace();

GUI.enabled = !currentConnectionIsLocal;
currentConnection.IP = EditorGUILayout.TextField(ipAddressLabel, currentConnection.IP, GUILayout.Width(halfWidth));
currentConnection.IP = EditorGUILayout.TextField(ipAddressLabel, currentConnection.IP, GUILayout.Width(HalfWidth));
GUI.enabled = true;

GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();
currentConnection.User = EditorGUILayout.TextField("Username", currentConnection.User, GUILayout.Width(halfWidth));
currentConnection.User = EditorGUILayout.TextField("Username", currentConnection.User, GUILayout.Width(HalfWidth));
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();
currentConnection.Password = EditorGUILayout.PasswordField("Password", currentConnection.Password, GUILayout.Width(halfWidth));
currentConnection.Password = EditorGUILayout.PasswordField("Password", currentConnection.Password, GUILayout.Width(HalfWidth));
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();

Expand Down Expand Up @@ -784,7 +761,7 @@ private void DeployGUI()
{
GUI.enabled = IsValidIpAddress(currentConnection.IP) && IsCredentialsValid(currentConnection);

if (GUILayout.Button("Connect", GUILayout.Width(quarterWidth)))
if (GUILayout.Button("Connect"))
{
EditorApplication.delayCall += () =>
{
Expand All @@ -798,7 +775,7 @@ private void DeployGUI()
GUI.enabled = DevicePortalConnectionEnabled && CanInstall;

// Open web portal
if (GUILayout.Button("Open Device Portal", GUILayout.Width(quarterWidth)))
if (GUILayout.Button("Open Device Portal", GUILayout.Width(128f)))
{
EditorApplication.delayCall += () => OpenDevicePortal(portalConnections, currentConnection);
}
Expand Down
0 .../BuildAndDeploy/BuildDeployWindow.cs.meta → ...ildAndDeploy/UwpBuildDeployWindow.cs.meta
View file
Open in desktop
File renamed without changes.
Loading