From c667f4724840b6e39bad5f4c298d7b438e3863ad Mon Sep 17 00:00:00 2001
From: Aaron Dodson <aaron.dodson@raspberrypi.org>
Date: Fri, 25 Sep 2026 14:28:59 -0700
Subject: [PATCH] fix: Improve the display of comment focus rings

---
 .../blockly/core/comments/comment_view.ts     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/blockly/core/comments/comment_view.ts b/packages/blockly/core/comments/comment_view.ts
index 1f702ae46ff..bd38581ecc8 100644
--- a/packages/blockly/core/comments/comment_view.ts
+++ b/packages/blockly/core/comments/comment_view.ts
@@ -764,22 +764,26 @@ css.register(`
   fill: none;
 }
 
-.blocklyCommentText.blocklyActiveFocus {
-  border-color: #fc3;
-  border-width: 2px;
+.blocklyComment.blocklyActiveFocus .blocklyCommentHighlight {
+  stroke: var(--blockly-active-node-color);
+  stroke-width: calc(2 * var(--blockly-selection-width));
 }
 
-.blocklySelected .blocklyCommentHighlight {
-  stroke: #fc3;
-  stroke-width: 3px;
+.blocklyCollapsed.blocklyComment.blocklyActiveFocus .blocklyCommentTopbarBackground {
+  stroke: var(--blockly-active-node-color);
+  stroke-width: var(--blockly-selection-width);
 }
 
-.blocklyCollapsed.blocklySelected .blocklyCommentHighlight {
-  stroke: none;
+.blocklyCommentText.blocklyActiveFocus {
+  border-color: var(--blockly-active-node-color);
+  border-width: var(--blockly-selection-width);
 }
 
-.blocklyCollapsed.blocklySelected .blocklyCommentTopbarBackground {
-  stroke: #fc3;
-  stroke-width: 3px;
+.blocklyCommentTopbar image.blocklyActiveFocus {
+  outline: var(--blockly-selection-width) solid var(--blockly-active-node-color);
+}
+
+.blocklyCollapsed.blocklyComment.blocklyActiveFocus .blocklyCommentHighlight {
+  stroke: none;
 }
 `);