opensource/MooTool
3
0
Fork 0
mirror of https://github.com/rememberber/MooTool.git synced 2026-09-19 10:46:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新字体版本，随手记增加Inter字体

Browse Source
This commit is contained in:
RememBerBer
2024-01-25 10:01:12 +08:00
parent ac6e52f320
commit 3c338a6b10
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+8 -7
View File
@@ -35,7 +35,8 @@
<flatlaf.version>3.4-SNAPSHOT</flatlaf.version>
<flatlaf-extras.version>3.4-SNAPSHOT</flatlaf-extras.version>
<flatlaf-intellij-themes.version>3.4-SNAPSHOT</flatlaf-intellij-themes.version>
<flatlaf-fonts-jetbrains-mono.version>2.242</flatlaf-fonts-jetbrains-mono.version>
<flatlaf-fonts-jetbrains-mono.version>2.304</flatlaf-fonts-jetbrains-mono.version>
<flatlaf-fonts-inter.version>4.0</flatlaf-fonts-inter.version>
<rsyntaxtextarea.version>3.3.4</rsyntaxtextarea.version>
<sql-formatter.version>2.0.4</sql-formatter.version>
<google-java-format.version>1.18.1</google-java-format.version>
@@ -182,12 +183,12 @@
<groupId>com.formdev</groupId>
<artifactId>flatlaf-fonts-jetbrains-mono</artifactId>
<version>${flatlaf-fonts-jetbrains-mono.version}</version>
<exclusions>
<exclusion>
<artifactId>flatlaf</artifactId>
<groupId>com.formdev</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.formdev</groupId>
<artifactId>flatlaf-fonts-inter</artifactId>
<version>${flatlaf-fonts-inter.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea -->
src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewer.java
+3
View File
@@ -1,6 +1,7 @@
package com.luoboduner.moo.tool.ui.component.textviewer;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
import com.formdev.flatlaf.util.FontUtils;
import com.formdev.flatlaf.util.StringUtils;
@@ -155,6 +156,8 @@ public class QuickNoteRSyntaxTextViewer extends RSyntaxTextArea {
Font font;
if (FlatJetBrainsMonoFont.FAMILY.equals(fontName)) {
font = FontUtils.getCompositeFont(FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, fontSize);
} else if (FlatInterFont.FAMILY.equals(fontName)) {
font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, fontSize);
} else {
font = new Font(fontName, Font.PLAIN, fontSize);
}
src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewerManager.java
+6 -1
View File
@@ -1,6 +1,7 @@
package com.luoboduner.moo.tool.ui.component.textviewer;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
import com.formdev.flatlaf.util.FontUtils;
import com.luoboduner.moo.tool.App;
@@ -46,6 +47,8 @@ public class QuickNoteRSyntaxTextViewerManager {
Font font;
if (FlatJetBrainsMonoFont.FAMILY.equals(tQuickNote.getFontName())) {
font = FontUtils.getCompositeFont(FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
} else if (FlatInterFont.FAMILY.equals(tQuickNote.getFontName())) {
font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
} else {
font = new Font(tQuickNote.getFontName(), Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
}
@@ -66,7 +69,7 @@ public class QuickNoteRSyntaxTextViewerManager {
return rTextScrollPane;
}
public void updateFont(String name){
public void updateFont(String name) {
RTextScrollPane rTextScrollPane = viewMap.get(name);
if (rTextScrollPane != null) {
QuickNoteRSyntaxTextViewer plainTextViewer = (QuickNoteRSyntaxTextViewer) rTextScrollPane.getTextArea();
@@ -75,6 +78,8 @@ public class QuickNoteRSyntaxTextViewerManager {
Font font;
if (FlatJetBrainsMonoFont.FAMILY.equals(tQuickNote.getFontName())) {
font = FontUtils.getCompositeFont(FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
} else if (FlatInterFont.FAMILY.equals(tQuickNote.getFontName())) {
font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
} else {
font = new Font(tQuickNote.getFontName(), Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
}
src/main/java/com/luoboduner/moo/tool/ui/form/func/QuickNoteForm.java
+2
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil;
import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.extras.FlatSVGIcon;
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
import com.formdev.flatlaf.icons.FlatAbstractIcon;
import com.formdev.flatlaf.icons.FlatSearchIcon;
@@ -424,6 +425,7 @@ public class QuickNoteForm {
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
String[] fonts = ge.getAvailableFontFamilyNames();
quickNoteForm.getFontNameComboBox().addItem(FlatJetBrainsMonoFont.FAMILY);
quickNoteForm.getFontNameComboBox().addItem(FlatInterFont.FAMILY);
for (String font : fonts) {
if (StringUtils.isNotBlank(font)) {
quickNoteForm.getFontNameComboBox().addItem(font);