diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0bfe2ca..c0080cb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ slf4j = "2.0.17" pty4j = "0.13.3" tinylog = "2.7.0" kotlinx-coroutines = "1.10.2" -flatlaf = "3.5.4" +flatlaf = "3.6" kotlinx-serialization-json = "1.8.1" commons-codec = "1.18.0" commons-lang3 = "3.17.0" diff --git a/src/main/java/app/termora/CombinedKeyIdentityProvider.java b/src/main/java/app/termora/CombinedKeyIdentityProvider.java index 864d8f1..3711469 100644 --- a/src/main/java/app/termora/CombinedKeyIdentityProvider.java +++ b/src/main/java/app/termora/CombinedKeyIdentityProvider.java @@ -8,6 +8,7 @@ import java.security.GeneralSecurityException; import java.security.KeyPair; import java.util.*; +@Deprecated public class CombinedKeyIdentityProvider implements KeyIdentityProvider { private final List providers = new ArrayList<>(); diff --git a/src/main/java/app/termora/MyFlatTabbedPaneUI.java b/src/main/java/app/termora/MyFlatTabbedPaneUI.java index 8401821..f3b4b6e 100644 --- a/src/main/java/app/termora/MyFlatTabbedPaneUI.java +++ b/src/main/java/app/termora/MyFlatTabbedPaneUI.java @@ -14,6 +14,7 @@ import static com.formdev.flatlaf.util.UIScale.scale; /** * 如果要升级 FlatLaf 需要检查是否兼容 */ +@Deprecated public class MyFlatTabbedPaneUI extends FlatTabbedPaneUI { @Override protected void paintContentBorder(Graphics g, int tabPlacement, int selectedIndex) { diff --git a/src/main/kotlin/app/termora/MyTabbedPane.kt b/src/main/kotlin/app/termora/MyTabbedPane.kt index 872d8d2..89bb763 100644 --- a/src/main/kotlin/app/termora/MyTabbedPane.kt +++ b/src/main/kotlin/app/termora/MyTabbedPane.kt @@ -9,7 +9,6 @@ import java.awt.event.* import java.awt.image.BufferedImage import java.util.* import javax.swing.* -import javax.swing.plaf.TabbedPaneUI import kotlin.math.abs class MyTabbedPane : FlatTabbedPane() { @@ -21,18 +20,12 @@ class MyTabbedPane : FlatTabbedPane() { private val owner get() = AnActionEvent(this, StringUtils.EMPTY, EventObject(this)) .getData(DataProviders.TermoraFrame) as TermoraFrame - private val myUI = MyFlatTabbedPaneUI() init { isFocusable = false - super.setUI(myUI) initEvents() } - override fun setUI(ui: TabbedPaneUI?) { - super.setUI(myUI) - } - override fun updateUI() { styleMap = mapOf( "focusColor" to UIManager.getColor("TabbedPane.selectedBackground"),