Skip to content

Commit 7c2ec4c

Browse files
committed
Update MRTK logo and add support for both themes
1 parent b62665e commit 7c2ec4c

File tree

6 files changed

+96
-4
lines changed

6 files changed

+96
-4
lines changed

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityBaseConfigurationProfileInspector.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,21 @@ namespace Microsoft.MixedReality.Toolkit.Inspectors
1010
public abstract class MixedRealityBaseConfigurationProfileInspector : Editor
1111
{
1212
[SerializeField]
13-
private Texture2D logo = null;
13+
private Texture2D logoLightTheme = null;
14+
15+
[SerializeField]
16+
private Texture2D logoDarkTheme = null;
1417

1518
protected virtual void Awake()
1619
{
17-
if (logo == null)
20+
if (logoLightTheme == null)
21+
{
22+
logoLightTheme = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/MixedRealityToolkit/_Core/Resources/Textures/MRTK_Logo_Black.png", typeof(Texture2D));
23+
}
24+
25+
if (logoDarkTheme == null)
1826
{
19-
logo = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/MixedRealityToolkit/_Core/Resources/Textures/MRTK_Logo.png", typeof(Texture2D));
27+
logoDarkTheme = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/MixedRealityToolkit/_Core/Resources/Textures/MRTK_Logo_White.png", typeof(Texture2D));
2028
}
2129
}
2230

@@ -27,7 +35,7 @@ protected void RenderMixedRealityToolkitLogo()
2735
{
2836
GUILayout.BeginHorizontal();
2937
GUILayout.FlexibleSpace();
30-
GUILayout.Label(logo, GUILayout.MaxHeight(128f));
38+
GUILayout.Label(EditorGUIUtility.isProSkin ? logoDarkTheme : logoLightTheme, GUILayout.MaxHeight(128f));
3139
GUILayout.FlexibleSpace();
3240
GUILayout.EndHorizontal();
3341
GUILayout.Space(12f);
-38.3 KB
Binary file not shown.
23.8 KB
Loading

Assets/MixedRealityToolkit/_Core/Resources/Textures/MRTK_Logo_Black.png.meta

Lines changed: 84 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
24.5 KB
Loading

Assets/MixedRealityToolkit/_Core/Resources/Textures/MRTK_Logo.png.meta renamed to Assets/MixedRealityToolkit/_Core/Resources/Textures/MRTK_Logo_White.png.meta

File renamed without changes.

0 commit comments

Comments
 (0)