From 2bfdf5eff5d6d54cb998b44217e495d195f27bb2 Mon Sep 17 00:00:00 2001 From: sethg Date: Tue, 18 Aug 2026 12:20:24 +0200 Subject: [PATCH 1/3] Fix filter icon logic --- app/util/Layer.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/app/util/Layer.js b/app/util/Layer.js index 45ab549cc..5a65c1105 100644 --- a/app/util/Layer.js +++ b/app/util/Layer.js @@ -118,23 +118,10 @@ Ext.define('CpsiMapview.util.Layer', { Ext.log.warn('Layer type not recognized (updateLayerNodeUI)'); } - const originalGlyph = layer.get('_origTreeConf') - ? layer.get('_origTreeConf').glyph - : null; - const expandedGlyph = 'f0b0'; if (hasFilters) { - // only set the glyph and class if needed - better for performance - if (node.get('glyph') !== expandedGlyph) { - node.set('glyph', expandedGlyph); - node.addCls('cpsi-tree-node-filtered'); - } + node.addCls('cpsi-tree-node-filtered'); } else { - // only set the glyph and class if needed - better for performance - if (node.get('glyph') !== originalGlyph) { - // revert to the original glyph if set on the layer - node.set('glyph', originalGlyph); - node.removeCls('cpsi-tree-node-filtered'); - } + node.removeCls('cpsi-tree-node-filtered'); } if (triggerUIUpdate) { From 8ed89eb64dc695c4b3e0fe1fb8da3d0a4bc2b373 Mon Sep 17 00:00:00 2001 From: sethg Date: Tue, 18 Aug 2026 12:21:46 +0200 Subject: [PATCH 2/3] Update CSS --- sass/src/view/LayerTree.scss | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sass/src/view/LayerTree.scss b/sass/src/view/LayerTree.scss index afacbc507..d7cfe018d 100644 --- a/sass/src/view/LayerTree.scss +++ b/sass/src/view/LayerTree.scss @@ -13,10 +13,22 @@ font-style: italic; font-weight: bold; - .x-tree-checkbox:after { - content: "\f0b0"; - font-family: "Font Awesome 5 Free" !important; + .x-tree-checkbox { + position: relative; // anchor point for the badge + margin-right: 14px; // make room so the badge doesn't collide with .x-tree-icon } + + .x-tree-checkbox:after { + position: absolute; + left: 100%; // immediately to the right of the checkbox box + top: 50%; + transform: translateY(-50%); + margin-left: 2px; // add small gap between checkbox and icon + font-family: 'Font Awesome 5 Free' !important; // Solid — \f0b0 has no Regular version + font-size: 12px; // smaller than the tree icon + line-height: 1; + pointer-events: none; // don't let it handle clicks meant for the checkbox + } } .cpsi-tree-node-baselayer { From 747904ad2d49ea8c64aeecaba5168865fd265563 Mon Sep 17 00:00:00 2001 From: Seth G Date: Tue, 18 Aug 2026 12:27:36 +0200 Subject: [PATCH 3/3] Add back content --- sass/src/view/LayerTree.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/sass/src/view/LayerTree.scss b/sass/src/view/LayerTree.scss index d7cfe018d..617d5194a 100644 --- a/sass/src/view/LayerTree.scss +++ b/sass/src/view/LayerTree.scss @@ -19,6 +19,7 @@ } .x-tree-checkbox:after { + content: "\f0b0"; position: absolute; left: 100%; // immediately to the right of the checkbox box top: 50%;