From c734ead9c106e1d68ec1cb077c0e63b939d8c681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 29 Oct 2022 16:52:41 +0200 Subject: [PATCH] WebTree: In single selection mode, you can't unselect the selected item with the mouse anymore. [GB.WEB.GUI] * BUG: WebTree: In single selection mode, you can't unselect the selected item with the mouse anymore. * BUG: WebTree: Settings the Mode property correctly update the control. --- comp/src/gb.web.gui/.src/Test/Webform1.class | 12 ++++++++++++ comp/src/gb.web.gui/.src/Test/Webform1.webform | 15 +++++++++++++-- comp/src/gb.web.gui/.src/Tree/WebTree.class | 2 ++ comp/src/gb.web.gui/lib.js | 3 +++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/comp/src/gb.web.gui/.src/Test/Webform1.class b/comp/src/gb.web.gui/.src/Test/Webform1.class index ef432fb37..9aa507a1a 100644 --- a/comp/src/gb.web.gui/.src/Test/Webform1.class +++ b/comp/src/gb.web.gui/.src/Test/Webform1.class @@ -359,3 +359,15 @@ Public Sub WebTextArea1_KeyPress() WebForm.Print("WebTextArea1: keypress: " & Key.Shortcut) End + +Public Sub btnCopy_Click() + + WebTextArea1.Copy() + +End + +Public Sub btnMultiple_Click() + + WebTree1.Mode = If(WebTree1.Mode = Select.Single, Select.Multiple, Select.Single) + +End diff --git a/comp/src/gb.web.gui/.src/Test/Webform1.webform b/comp/src/gb.web.gui/.src/Test/Webform1.webform index 746b979bb..ad6151c88 100644 --- a/comp/src/gb.web.gui/.src/Test/Webform1.webform +++ b/comp/src/gb.web.gui/.src/Test/Webform1.webform @@ -196,8 +196,15 @@ List = [("Élément 1"), ("Élément 2"), ("Élément 3"), ("Élément 4"), ("Élément 5"), ("Élément 6"), ("Élément 7"), ("Élément 8"), ("Élément 9"), ("Élément 10"), ("Élément 11"), ("Élément 12")] UseHTML = True } + { WebHBox6 WebHBox + #MoveScaled(1,46,128.75,6) + { btnCopy WebButton + #MoveScaled(1,1,16,4) + Text = ("Copy") + } + } { WebTextArea1 WebTextArea - #MoveScaled(1,46,128.75,16) + #MoveScaled(1,53,128.75,16) Height = "8em" } Index = 2 @@ -264,8 +271,12 @@ #MoveScaled(1,1,15,4) Text = ("Check") } + { btnMultiple WebButton + #MoveScaled(17,1,15,4) + Text = ("Multiple") + } { lblTreeEvent WebLabel - #MoveScaled(17,1,30,4) + #MoveScaled(33,1,30,4) Expand = True Border = True } diff --git a/comp/src/gb.web.gui/.src/Tree/WebTree.class b/comp/src/gb.web.gui/.src/Tree/WebTree.class index 42b700157..0008292c1 100644 --- a/comp/src/gb.web.gui/.src/Tree/WebTree.class +++ b/comp/src/gb.web.gui/.src/Tree/WebTree.class @@ -540,6 +540,8 @@ End Private Sub Mode_Write(Value As Integer) $iMode = Value + UnSelectAll + Me.Refresh End diff --git a/comp/src/gb.web.gui/lib.js b/comp/src/gb.web.gui/lib.js index 3bca61c6c..18d865ecf 100644 --- a/comp/src/gb.web.gui/lib.js +++ b/comp/src/gb.web.gui/lib.js @@ -1298,6 +1298,9 @@ gw = { elt.focus(); + if (!event && !checked) + return; + if (event && event.shiftKey && last) gw.table.checkRange(id, last, row, checked); else