Skip to content

Commit fbd81f1

Browse files
sschmidsschmid
committed
Update Editor windows
1 parent cd3ce84 commit fbd81f1

File tree

3 files changed

+45
-26
lines changed

3 files changed

+45
-26
lines changed

‎.bee/entitas.sh‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ DEPS=(
1212
"../DesperateDevs/DesperateDevs.CodeGeneration.Unity.Plugins/bin/Release/"
1313
"../DesperateDevs/DesperateDevs.Unity.Editor/bin/Release/"
1414
"../DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor/Compile.cs"
15+
"../DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor/Images/"
1516
)
1617
ENTITAS_PROJECTS=(
1718
'Entitas'
@@ -77,6 +78,10 @@ DESPERATEDEVS_EDITOR=(
7778
'DesperateDevs.CodeGeneration.dll'
7879
'DesperateDevs.Unity.Editor.dll'
7980
)
81+
DESPERATEDEVS_IMAGES=(
82+
'JennyHeader.png'
83+
'JennyHeader.png.meta'
84+
)
8085
DESPERATEDEVS_PLUGINS=(
8186
'DesperateDevs.CodeGeneration.Plugins.dll'
8287
'DesperateDevs.CodeGeneration.Unity.Plugins.dll'
@@ -113,9 +118,10 @@ entitas::collect_entitas_unity() {
113118
local images_dir="${entitas_editor_dir}/Images"
114119
local desperatedevs_dir="${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs"
115120
local desperatedevs_editor_dir="${desperatedevs_dir}/Editor"
121+
local desperatedevs_images_dir="${desperatedevs_editor_dir}/Images"
116122
local desperatedevs_plugins_dir="${desperatedevs_editor_dir}/Plugins"
117123
utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \
118-
"${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}"
124+
"${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_images_dir}" "${desperatedevs_plugins_dir}"
119125

120126
for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync "${p}/bin/Release/" "${entitas_dir}"; done
121127
utils::sync "${DEPS_DIR}/" "${entitas_dir}"
@@ -124,6 +130,7 @@ entitas::collect_entitas_unity() {
124130
for f in "${IMAGES[@]}"; do utils::sync "${f}" "${images_dir}"; done
125131
for f in "${DESPERATEDEVS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_dir}"; done
126132
for f in "${DESPERATEDEVS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}"; done
133+
for f in "${DESPERATEDEVS_IMAGES[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_images_dir}"; done
127134
for f in "${DESPERATEDEVS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}"; done
128135
}
129136

@@ -135,9 +142,10 @@ entitas::collect_entitas_with_blueprints_unity() {
135142
local images_dir="${entitas_editor_dir}/Images"
136143
local desperatedevs_dir="${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs"
137144
local desperatedevs_editor_dir="${desperatedevs_dir}/Editor"
145+
local desperatedevs_images_dir="${desperatedevs_editor_dir}/Images"
138146
local desperatedevs_plugins_dir="${desperatedevs_editor_dir}/Plugins"
139147
utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \
140-
"${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}"
148+
"${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_images_dir}" "${desperatedevs_plugins_dir}"
141149

142150
for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync "${p}/bin/Release/" "${entitas_dir}"; done
143151
for p in "${BLUEPRINTS_PROJECTS[@]}"; do utils::sync "${p}/bin/Release/" "${entitas_dir}"; done
@@ -149,6 +157,7 @@ entitas::collect_entitas_with_blueprints_unity() {
149157
for d in "${IMAGES[@]}"; do utils::sync "${d}" "${images_dir}"; done
150158
for f in "${DESPERATEDEVS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_dir}"; done
151159
for f in "${DESPERATEDEVS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}"; done
160+
for f in "${DESPERATEDEVS_IMAGES[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_images_dir}"; done
152161
for f in "${DESPERATEDEVS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}"; done
153162
}
154163

‎Addons/Entitas.Migration.Unity.Editor/Entitas.Migration.Unity.Editor/MigrationWindow.cs‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,51 +6,58 @@
66
using UnityEditor;
77
using UnityEngine;
88

9-
namespace Entitas.Migration.Unity.Editor {
10-
11-
public class MigrationWindow : EditorWindow {
12-
9+
namespace Entitas.Migration.Unity.Editor
10+
{
11+
public class MigrationWindow : EditorWindow
12+
{
1313
[MenuItem("Tools/Entitas/Migrate...", false, 1000)]
14-
public static void OpenMigrate() {
15-
EditorLayout
16-
.GetWindow<MigrationWindow>("Entitas Migration - " + CheckForUpdates.GetLocalVersion(), new Vector2(415f, 564))
17-
.Show();
14+
public static void OpenMigrate()
15+
{
16+
var window = GetWindow<MigrationWindow>(true, "Entitas Migration - " + CheckForUpdates.GetLocalVersion());
17+
window.minSize = new Vector2(415f, 564);
18+
window.Show();
1819
}
1920

2021
Texture2D _headerTexture;
2122
IMigration[] _migrations;
2223
bool[] _showMigration;
2324
Vector2 _scrollViewPosition;
2425

25-
void OnEnable() {
26+
void OnEnable()
27+
{
2628
_headerTexture = EditorLayout.LoadTexture("l:EntitasHeader");
2729
_migrations = getMigrations();
2830
_showMigration = new bool[_migrations.Length];
2931
_showMigration[0] = true;
3032
}
3133

32-
static IMigration[] getMigrations() {
34+
static IMigration[] getMigrations()
35+
{
3336
return AppDomain.CurrentDomain
3437
.GetInstancesOf<IMigration>()
3538
.OrderByDescending(instance => instance.GetType().FullName)
3639
.ToArray();
3740
}
3841

39-
void OnGUI() {
42+
void OnGUI()
43+
{
4044
_scrollViewPosition = EditorGUILayout.BeginScrollView(_scrollViewPosition);
4145
{
4246
EditorLayout.DrawTexture(_headerTexture);
4347

4448
var descriptionStyle = new GUIStyle(GUI.skin.label);
4549
descriptionStyle.wordWrap = true;
46-
for (int i = 0; i < _migrations.Length; i++) {
50+
for (int i = 0; i < _migrations.Length; i++)
51+
{
4752
var migration = _migrations[i];
4853
_showMigration[i] = EditorLayout.DrawSectionHeaderToggle(migration.version, _showMigration[i]);
49-
if (_showMigration[i]) {
54+
if (_showMigration[i])
55+
{
5056
EditorLayout.BeginSectionContent();
5157
{
5258
EditorGUILayout.LabelField(migration.description, descriptionStyle);
53-
if (GUILayout.Button("Apply migration " + migration.version)) {
59+
if (GUILayout.Button("Apply migration " + migration.version))
60+
{
5461
migrate(migration, this);
5562
}
5663
}
@@ -61,15 +68,17 @@ void OnGUI() {
6168
EditorGUILayout.EndScrollView();
6269
}
6370

64-
static void migrate(IMigration migration, MigrationWindow window) {
71+
static void migrate(IMigration migration, MigrationWindow window)
72+
{
6573
var shouldMigrate = EditorUtility.DisplayDialog("Migrate",
6674
"You are about to migrate your source files. " +
6775
"Make sure that you have committed your current project or that you have a backup of your project before you proceed.",
6876
"I have a backup - Migrate",
6977
"Cancel"
7078
);
7179

72-
if (shouldMigrate) {
80+
if (shouldMigrate)
81+
{
7382
window.Close();
7483
EditorUtility.DisplayDialog("Migrate",
7584
"Please select the folder, " + migration.workingDirectory + ".",
@@ -78,14 +87,18 @@ static void migrate(IMigration migration, MigrationWindow window) {
7887

7988
var path = "Assets/";
8089
path = EditorUtility.OpenFolderPanel(migration.version + ": " + migration.workingDirectory, path, string.Empty);
81-
if (!string.IsNullOrEmpty(path)) {
90+
if (!string.IsNullOrEmpty(path))
91+
{
8292
var changedFiles = migration.Migrate(path);
8393
Debug.Log("Applying " + migration.version);
84-
foreach (var file in changedFiles) {
94+
foreach (var file in changedFiles)
95+
{
8596
MigrationUtils.WriteFiles(changedFiles);
8697
Debug.Log("Migrated " + file.fileName);
8798
}
88-
} else {
99+
}
100+
else
101+
{
89102
throw new Exception("Could not complete migration! Selected path was invalid!");
90103
}
91104
}

‎Addons/Entitas.Unity.Editor/Entitas.Unity.Editor/EntitasPreferencesWindow.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ public class EntitasPreferencesWindow : PreferencesWindow
1010
[MenuItem(EntitasMenuItems.preferences, false, EntitasMenuItemPriorities.preferences)]
1111
public static void OpenPreferences()
1212
{
13-
var window = EditorLayout.GetWindow<EntitasPreferencesWindow>(
14-
"Entitas " + CheckForUpdates.GetLocalVersion(),
15-
new Vector2(415f, 350)
16-
);
17-
13+
var window = GetWindow<EntitasPreferencesWindow>(true, "Entitas " + CheckForUpdates.GetLocalVersion());
14+
window.minSize = new Vector2(415f, 348f);
1815
window.Initialize(
1916
"Entitas.properties",
2017
Environment.UserName + ".userproperties",

0 commit comments

Comments
 (0)