GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Minor fixes to #3870

Browse Source
This commit is contained in:
Wojtek Figat
2026-03-10 22:22:02 +01:00
parent 337fea0f69
commit 0d133cfbdc
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
View File

@@ -325,7 +325,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
var codeEditor = options.SourceCode.SourceCodeEditor;
if (codeEditor != "None")
{
foreach (var e in Editor.Instance.CodeEditing.Editors)
foreach (var e in _editors)
{
if (string.Equals(codeEditor, e.Name, StringComparison.OrdinalIgnoreCase))
{
@@ -334,10 +334,10 @@ namespace FlaxEditor.Modules.SourceCodeEditing
}
}
}
if (editor == null)
editor = Editor.Instance.CodeEditing.Editors[0];
if (editor == null && _editors.Count != 0)
editor = _editors[0];
Editor.Instance.CodeEditing.SelectedEditor = editor;
SelectedEditor = editor;
}
/// <summary>

36
Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
View File

@@ -145,7 +145,41 @@ CodeEditorTypes VisualStudioEditor::GetType() const
String VisualStudioEditor::GetName() const
{
return String(ToString(_version));
const Char* name;
switch (_version)
{
case VisualStudioVersion::VS2008:
name = TEXT("Visual Studio 2008");
break;
case VisualStudioVersion::VS2010:
name = TEXT("Visual Studio 2010");
break;
case VisualStudioVersion::VS2012:
name = TEXT("Visual Studio 2012");
break;
case VisualStudioVersion::VS2013:
name = TEXT("Visual Studio 2013");
break;
case VisualStudioVersion::VS2015:
name = TEXT("Visual Studio 2015");
break;
case VisualStudioVersion::VS2017:
name = TEXT("Visual Studio 2017");
break;
case VisualStudioVersion::VS2019:
name = TEXT("Visual Studio 2019");
break;
case VisualStudioVersion::VS2022:
name = TEXT("Visual Studio 2022");
break;
case VisualStudioVersion::VS2026:
name = TEXT("Visual Studio 2026");
break;
default:
name = ToString(_version);
break;
}
return String(name);
}
String VisualStudioEditor::GetGenerateProjectCustomArgs() const