From 74f17ceed6dd95f2363a4501bc815dbb4ba819c6 Mon Sep 17 00:00:00 2001 From: Ilya usov Date: Wed, 10 Jun 2020 17:15:49 +0300 Subject: [PATCH] Fix RIDER-43771 (Wrong text color for unfocused stack) GitOrigin-RevId: d0d1eb59e6bdc23bbb90d4c906050b155d948927 --- .../intellij/xdebugger/impl/frame/XDebuggerFramesList.java | 2 ++ .../intellij/xdebugger/impl/frame/XDebuggerThreadsList.kt | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java index 76d97bb99a89..d572a8b95a9f 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java @@ -211,6 +211,8 @@ public class XDebuggerFramesList extends DebuggerFramesList { } else if (Registry.is("debugger.new.debug.tool.window.view")){ setBackground(UIUtil.getListSelectionBackground(hasFocus)); + setForeground(UIUtil.getListSelectionForeground(hasFocus)); + mySelectionForeground = getForeground(); } stackFrame.customizePresentation(this); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerThreadsList.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerThreadsList.kt index 4efc3627e6a9..f590a1508286 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerThreadsList.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerThreadsList.kt @@ -129,6 +129,11 @@ class XDebuggerThreadsList(private val renderer: ListCellRenderer) : hasFocus: Boolean ) { val stack = value ?: return + if (selected) { + background = UIUtil.getListSelectionBackground(hasFocus) + foreground = UIUtil.getListSelectionForeground(hasFocus) + mySelectionForeground = foreground + } when (stack.kind) { StackInfo.StackKind.ExecutionStack -> { append(stack.toString()) @@ -137,8 +142,6 @@ class XDebuggerThreadsList(private val renderer: ListCellRenderer) : StackInfo.StackKind.Error, StackInfo.StackKind.Loading -> append(stack.toString()) } - if (selected) - background = UIUtil.getListSelectionBackground(hasFocus) } } }