M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/_VisualDVM/ProjectData/Files/DBProjectFile.java
View File

@@ -415,8 +415,8 @@ public class DBProjectFile extends ProjectFile {
break;
}
languageName = parent.languageName;
if (sapforStyle) style = Global.mainModule.getProject().sapforProperties.FREE_FORM? LanguageStyle.free : LanguageStyle.fixed;
if (sapforStyle)
style = Global.mainModule.getProject().sapforProperties.FREE_FORM ? LanguageStyle.free : LanguageStyle.fixed;
else style = parent.style;
}
public void importSourceCodeSettings(DBProjectFile parent, boolean sapforStyle) throws Exception {
@@ -430,7 +430,8 @@ public class DBProjectFile extends ProjectFile {
break;
}
languageName = parent.languageName;
if (sapforStyle) style = Global.mainModule.getProject().sapforProperties.FREE_FORM? LanguageStyle.free : LanguageStyle.fixed;
if (sapforStyle)
style = Global.mainModule.getProject().sapforProperties.FREE_FORM ? LanguageStyle.free : LanguageStyle.fixed;
else style = parent.style;
}
//------------------

12
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -1,5 +1,7 @@
package _VisualDVM.ProjectData.Files.UI.Editor;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Editor.BaseEditor;
import Common.Visual.Menus.StyledPopupMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -8,10 +10,10 @@ import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.CaretInfo;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
import _VisualDVM.Visual.Menus.MainEditorMenu;
import _VisualDVM.Visual.Syntax.SPFEditorTheme;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
@@ -204,4 +206,12 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
public int getCurrentSymbol() {
return getCaretOffsetFromLineStart() + 1;
}
@Override
public void applyTheme() {
float font_size = (float) getFont().getSize();
((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
setFont(getFont().deriveFont(font_size));
menu.applyTheme();
//меню связано с редактором. поэтому тема меняется только вместе с ним.
}
}