stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-18 10:01:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Code folding in the script editor works again. Fixes #115.

Browse source
This commit is contained in:
biwa 2019-12-24 15:58:20 +01:00
parent e187872553
commit 37c52b4d70
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Controls/Scripting/ScriptDocumentTab.cs
View file

@ -381,7 +381,7 @@ namespace CodeImp.DoomBuilder.Controls
// Text must be exactly the same // Text must be exactly the same
long hash = MurmurHash2.Hash(Text); long hash = MurmurHash2.Hash(Text);
bool applyfolding = General.Settings.ScriptShowFolding && (editor.Scintilla.Lexer == Lexer.Cpp /*|| editor.Scintilla.Lexer == Lexer.CppNoCase*/); bool applyfolding = General.Settings.ScriptShowFolding && (editor.Scintilla.Lexer == Lexer.Cpp || (int)editor.Scintilla.Lexer == 35); // 35 - custom CPP case insensitive style lexer
if(hash == settings.Hash) if(hash == settings.Hash)
{ {
// Restore fold levels // Restore fold levels
@ -402,7 +402,7 @@ namespace CodeImp.DoomBuilder.Controls
internal void SetDefaultViewSettings() internal void SetDefaultViewSettings()
{ {
if(General.Settings.ScriptShowFolding && (editor.Scintilla.Lexer == Lexer.Cpp /*|| editor.Scintilla.Lexer == Lexer.CppNoCase*/)) if(General.Settings.ScriptShowFolding && (editor.Scintilla.Lexer == Lexer.Cpp || (int)editor.Scintilla.Lexer == 35)) // 35 - custom CPP case insensitive style lexer
ApplyFolding(GetFoldLevels()); ApplyFolding(GetFoldLevels());
} }

2
Source/Core/Controls/Scripting/ScriptEditorControl.cs
View file

@ -479,7 +479,7 @@ namespace CodeImp.DoomBuilder.Controls
handler.SetKeywords(lexercfg, lexername); handler.SetKeywords(lexercfg, lexername);
// Setup folding (https://github.com/jacobslusser/ScintillaNET/wiki/Automatic-Code-Folding) // Setup folding (https://github.com/jacobslusser/ScintillaNET/wiki/Automatic-Code-Folding)
if(General.Settings.ScriptShowFolding && (scriptconfig.Lexer == Lexer.Cpp /*|| scriptconfig.Lexer == Lexer.CppNoCase*/)) if(General.Settings.ScriptShowFolding && (scriptconfig.Lexer == Lexer.Cpp || (int)scriptconfig.Lexer == 35)) // 35 - custom CPP case insensitive style lexer
{ {
// Instruct the lexer to calculate folding // Instruct the lexer to calculate folding
scriptedit.SetProperty("fold", "1"); scriptedit.SetProperty("fold", "1");