opensource/MooTool
3
0
Fork 0
mirror of https://github.com/rememberber/MooTool.git synced 2026-09-01 04:57:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整diff工具TextArea实现类为RegexRSyntaxTextViewer，以便更好的支持黑/白主题切换后的表现

Browse Source
This commit is contained in:
RememBerBer
2025-09-28 14:13:17 +08:00
parent c990d75879
commit 50237a34cc
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/luoboduner/moo/tool/ui/component/TopMenuBar.java
+5 -4
View File
@@ -12,10 +12,7 @@ import com.luoboduner.moo.tool.ui.component.textviewer.QuickNoteRSyntaxTextViewe
import com.luoboduner.moo.tool.ui.component.textviewer.QuickNoteRSyntaxTextViewerManager;
import com.luoboduner.moo.tool.ui.dialog.*;
import com.luoboduner.moo.tool.ui.form.MainWindow;
import com.luoboduner.moo.tool.ui.form.func.HostForm;
import com.luoboduner.moo.tool.ui.form.func.JavaConsoleForm;
import com.luoboduner.moo.tool.ui.form.func.JsonBeautyForm;
import com.luoboduner.moo.tool.ui.form.func.RegexForm;
import com.luoboduner.moo.tool.ui.form.func.*;
import com.luoboduner.moo.tool.util.SystemUtil;
import com.luoboduner.moo.tool.util.UpgradeUtil;
@@ -447,6 +444,10 @@ public class TopMenuBar extends JMenuBar {
JavaConsoleForm.getInstance().getScrollPane().updateTheme();
JavaConsoleForm.getInstance().getScrollPane().updateUI();
TextDiffForm.getInstance().getLeftTextArea().updateTheme();
TextDiffForm.getInstance().getRightTextArea().updateTheme();
SwingUtilities.updateComponentTreeUI(App.popupMenu);
App.popupMenu.updateUI();
}
src/main/java/com/luoboduner/moo/tool/ui/form/func/TextDiffForm.java
+7 -6
View File
@@ -12,6 +12,7 @@ import com.luoboduner.moo.tool.dao.TFuncContentMapper;
import com.luoboduner.moo.tool.domain.TFuncContent;
import com.luoboduner.moo.tool.service.DiffService;
import com.luoboduner.moo.tool.ui.FuncConsts;
import com.luoboduner.moo.tool.ui.component.textviewer.RegexRSyntaxTextViewer;
import com.luoboduner.moo.tool.ui.listener.func.TextDiffListener;
import com.luoboduner.moo.tool.util.MybatisUtil;
import com.luoboduner.moo.tool.util.ScrollUtil;
@@ -76,9 +77,9 @@ public class TextDiffForm {
private JScrollPane unifiedScrollPane;
private JPanel unifiedPanel;
private RSyntaxTextArea leftTextArea;
private RSyntaxTextArea rightTextArea;
private RSyntaxTextArea unifiedTextArea;
private RegexRSyntaxTextViewer leftTextArea;
private RegexRSyntaxTextViewer rightTextArea;
private RegexRSyntaxTextViewer unifiedTextArea;
// Diff highlight painters
private final DefaultHighlighter.DefaultHighlightPainter delPainter =
@@ -139,7 +140,7 @@ public class TextDiffForm {
*/
private void initTextAreas() {
// 左侧文本区域
leftTextArea = new RSyntaxTextArea();
leftTextArea = new RegexRSyntaxTextViewer();
leftTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_NONE);
leftTextArea.setCodeFoldingEnabled(true);
leftTextArea.setAntiAliasingEnabled(true);
@@ -150,7 +151,7 @@ public class TextDiffForm {
leftTextArea.setCaretPosition(0);
// 右侧文本区域
rightTextArea = new RSyntaxTextArea();
rightTextArea = new RegexRSyntaxTextViewer();
rightTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_NONE);
rightTextArea.setCodeFoldingEnabled(true);
rightTextArea.setAntiAliasingEnabled(true);
@@ -161,7 +162,7 @@ public class TextDiffForm {
rightTextArea.setCaretPosition(0);
// 统一diff显示区域
unifiedTextArea = new RSyntaxTextArea();
unifiedTextArea = new RegexRSyntaxTextViewer();
unifiedTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
unifiedTextArea.setCodeFoldingEnabled(true);
unifiedTextArea.setAntiAliasingEnabled(true);