From db9221c93cbc6f035fe00ff64b6736846e8f4513 Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 7 Nov 2022 20:08:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-13349=20feat:=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86checkselectedswitcher=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0faf129968ab4468cc10b85c37a65b511061c5f3) --- .../multitree/trigger/multi.tree.button.checkselected.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/widget/multitree/trigger/multi.tree.button.checkselected.js b/src/widget/multitree/trigger/multi.tree.button.checkselected.js index 59522d784..5efd65b2e 100644 --- a/src/widget/multitree/trigger/multi.tree.button.checkselected.js +++ b/src/widget/multitree/trigger/multi.tree.button.checkselected.js @@ -19,8 +19,8 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { this.indicator = BI.createWidget({ type: "bi.icon_button", cls: "check-font trigger-check-selected icon-size-12", - width: 15, - height: 15, + width: 16, + height: 16, stopPropagation: true }); @@ -31,7 +31,6 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { hgap: 4, text: BI.i18nText("BI-Check_Selected"), textAlign: "center", - textHeight: 15 }); this.checkSelected.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); @@ -65,4 +64,4 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { }); BI.MultiTreeCheckSelectedButton.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.multi_tree_check_selected_button", BI.MultiTreeCheckSelectedButton); \ No newline at end of file +BI.shortcut("bi.multi_tree_check_selected_button", BI.MultiTreeCheckSelectedButton); From 3a06d3a166c4ff5caa2211e3dcffe81a7e82532a Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 16 Nov 2022 16:38:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-13349=20feat:=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86checkselectedswitcher=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multitree/trigger/multi.tree.button.checkselected.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less b/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less index 55207b67a..5393d7b24 100644 --- a/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less +++ b/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less @@ -7,6 +7,7 @@ } .trigger-check-text { .border-radius(8px); + .border-radius(calc(var(--css-scale, 1) * 8px)); z-index: 1; &:active { background-color: @color-bi-background-multi-select-trigger-check-selected;