Merge branch 'refs/heads/v3.6/next' into v3.6/213

# Conflicts: # build.gradle.kts # src/main/resources/META-INF/plugin.xml
YiiGuxing · Jun 14, 2024 · 4580f41 · 4580f41
2 parents b201542 + a1ddbd1
commit 4580f41
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@
 - Bug fixes.
 - Bug 修复
 
+## [3.6.2] (2024/06/12)
+
+- Bug fixes.
+- Bug 修复
+
 ## [3.6.1] (2024/05/26)
 
 - Bug fixes.

diff --git a/src/main/java/cn/yiiguxing/plugin/translate/ui/balloon/BalloonPopupBuilder.java b/src/main/java/cn/yiiguxing/plugin/translate/ui/balloon/BalloonPopupBuilder.java
@@ -25,7 +25,6 @@
 import com.intellij.ui.JBColor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.JBUI;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -88,9 +87,6 @@ public BalloonPopupBuilder(@NotNull final JComponent content) {
     public BalloonPopupBuilder(@Nullable Map<Disposable, List<Balloon>> storage, @NotNull final JComponent content) {
         myStorage = storage;
         myContent = content;
-        if (UIUtil.isClientPropertyTrue(myContent, BalloonImpl.FORCED_NO_SHADOW)) {
-            myShadow = false;
-        }
     }
 
     @NotNull

diff --git a/src/main/kotlin/cn/yiiguxing/plugin/translate/TranslationDynamicBundle.kt b/src/main/kotlin/cn/yiiguxing/plugin/translate/TranslationDynamicBundle.kt
@@ -50,6 +50,5 @@ open class TranslationDynamicBundle(private val pathToBundle: String) : Abstract
                 null
             }
         }
-
     }
 }