From 440d28788f404211fa70657c08048ca2a211eb6d Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Mon, 15 Dec 2025 18:16:02 +0100 Subject: [PATCH] IJPL-223929 Gradient for tool window stripes is missing when dragging tool window icon GitOrigin-RevId: c3f4ed6b7358348ba98327f30458d3d0bfe11e6b --- .../com/intellij/openapi/wm/impl/AbstractDroppableStripe.kt | 6 ++++-- .../src/themes/islands/ManyIslandsDark.theme.json | 4 +--- .../src/themes/islands/ManyIslandsLight.theme.json | 4 +--- platform/util/ui/api-dump.txt | 1 - platform/util/ui/src/com/intellij/util/ui/JBUI.java | 2 -- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/AbstractDroppableStripe.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/AbstractDroppableStripe.kt index 15ddf600fadf..359f6531d13d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/AbstractDroppableStripe.kt +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/AbstractDroppableStripe.kt @@ -550,8 +550,10 @@ internal abstract class AbstractDroppableStripe(val paneId: String, layoutManage override fun paintComponent(g: Graphics) { super.paintComponent(g) if (!isFinishingDrop && isDroppingButton()) { - g.color = if (isNewStripes) JBUI.CurrentTheme.ToolWindow.DragAndDrop.STRIPE_BACKGROUND else background.brighter() - g.fillRect(0, 0, width, height) + if (!isNewStripes) { + g.color = background.brighter() + g.fillRect(0, 0, width, height) + } val rectangle = Rectangle(drawRectangle) if (!rectangle.isEmpty) { var round: Int? = null diff --git a/platform/platform-resources/src/themes/islands/ManyIslandsDark.theme.json b/platform/platform-resources/src/themes/islands/ManyIslandsDark.theme.json index 137e559777a5..38f0b1d1a14b 100644 --- a/platform/platform-resources/src/themes/islands/ManyIslandsDark.theme.json +++ b/platform/platform-resources/src/themes/islands/ManyIslandsDark.theme.json @@ -136,8 +136,7 @@ "background": "BackgroundLight", "borderColor": "BorderTransparent", "separatorColor": "Gray5" - }, - "Button.DragAndDrop.stripeBackground": "BackgroundLight" + } }, "StripeToolbar.Button": { @@ -733,7 +732,6 @@ "ToolWindow.Header.inactiveBackground": "#212326", "ToolWindow.background": "#212326", - "ToolWindow.Button.DragAndDrop.stripeBackground": "AltBackgroundLight", "Borders.color": "#2E3033", "Borders.ContrastBorderColor": "#2E3033", diff --git a/platform/platform-resources/src/themes/islands/ManyIslandsLight.theme.json b/platform/platform-resources/src/themes/islands/ManyIslandsLight.theme.json index 42ab4183beee..361d08249ea6 100644 --- a/platform/platform-resources/src/themes/islands/ManyIslandsLight.theme.json +++ b/platform/platform-resources/src/themes/islands/ManyIslandsLight.theme.json @@ -91,8 +91,7 @@ "Stripe": { "background": "BackgroundDark", "borderColor": "BorderTransparent" - }, - "Button.DragAndDrop.stripeBackground": "BackgroundDark" + } }, "StripeToolbar.Button": { @@ -261,7 +260,6 @@ "ToolWindow.Header.inactiveBackground": "#F7F6F8", "ToolWindow.background": "#F7F6F8", - "ToolWindow.Button.DragAndDrop.stripeBackground": "AltBackgroundDark", "Borders.color": "#E8E9ED", "Borders.ContrastBorderColor": "#E8E9ED", diff --git a/platform/util/ui/api-dump.txt b/platform/util/ui/api-dump.txt index 42e63bc09c0e..76556eacfbf3 100644 --- a/platform/util/ui/api-dump.txt +++ b/platform/util/ui/api-dump.txt @@ -4704,7 +4704,6 @@ com.intellij.util.ui.JBUI$CurrentTheme$ToolWindow$DragAndDrop - sf:BUTTON_DROP_BACKGROUND:java.awt.Color - sf:BUTTON_DROP_BORDER:java.awt.Color - sf:BUTTON_FLOATING_BACKGROUND:java.awt.Color -- sf:STRIPE_BACKGROUND:java.awt.Color f:com.intellij.util.ui.JBUI$CurrentTheme$Toolbar - sf:SEPARATOR_COLOR:java.awt.Color - ():V diff --git a/platform/util/ui/src/com/intellij/util/ui/JBUI.java b/platform/util/ui/src/com/intellij/util/ui/JBUI.java index e33c6a69a84a..4602333830d5 100644 --- a/platform/util/ui/src/com/intellij/util/ui/JBUI.java +++ b/platform/util/ui/src/com/intellij/util/ui/JBUI.java @@ -1123,8 +1123,6 @@ public final class JBUI { } public interface DragAndDrop { - Color STRIPE_BACKGROUND = JBColor.namedColor("ToolWindow.Button.DragAndDrop.stripeBackground", - CurrentTheme.DragAndDrop.Area.BACKGROUND); Color BUTTON_DROP_BACKGROUND = JBColor.namedColor("ToolWindow.Button.DragAndDrop.buttonDropBackground", CurrentTheme.DragAndDrop.Area.BACKGROUND); Color BUTTON_FLOATING_BACKGROUND = JBColor.namedColor("ToolWindow.Button.DragAndDrop.buttonFloatingBackground",