This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 94160fc jewel-togglebuttonbar: fix selectedIndex -1 and other
enhacements to make it fully work
94160fc is described below
commit 94160fce5d37d883121ca34a1adaf38711d533df
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Feb 14 11:30:18 2021 +0100
jewel-togglebuttonbar: fix selectedIndex -1 and other enhacements to make
it fully work
---
.../projects/Jewel/src/main/resources/defaults.css | 1 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 1 +
.../ToggleButtonBarSelectionMouseController.as | 83 ++++++++++++++++++++++
.../jewel/beads/views/ToggleButtonBarView.as | 13 +---
.../itemRenderers/ToggleButtonBarItemRenderer.as | 3 +
.../Jewel/src/main/sass/components/_buttonbar.sass | 1 +
6 files changed, 91 insertions(+), 11 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 631f6b6..357a498 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -299,6 +299,7 @@ j|IconButtonBar {
j|ToggleButtonBar {
IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.ToggleButtonBarView");
+ IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ToggleButtonBarSelectionMouseController");
IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.ToggleButtonBarItemRenderer");
}
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index fba6408..dce98ec 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -52,6 +52,7 @@ import org.apache.royale.utils.observeElementSize;
import
org.apache.royale.jewel.beads.controllers.DateFieldMouseController;
DateFieldMouseController;
import org.apache.royale.jewel.beads.controllers.AlertController;
AlertController;
import
org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController;
ListSingleSelectionMouseController;
+ import
org.apache.royale.jewel.beads.controllers.ToggleButtonBarSelectionMouseController;
ToggleButtonBarSelectionMouseController;
import
org.apache.royale.jewel.beads.controllers.ListKeyDownController;
ListKeyDownController;
import
org.apache.royale.jewel.beads.controllers.TableKeyDownController;
TableKeyDownController;
import
org.apache.royale.jewel.beads.controllers.VirtualListKeyDownController;
VirtualListKeyDownController;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ToggleButtonBarSelectionMouseController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ToggleButtonBarSelectionMouseController.as
new file mode 100644
index 0000000..c8ac11d
--- /dev/null
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ToggleButtonBarSelectionMouseController.as
@@ -0,0 +1,83 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.jewel.beads.controllers
+{
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.events.ItemClickedEvent;
+ import org.apache.royale.jewel.ToggleButtonBar;
+ import
org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController;
+
+ /**
+ * The Jewel ToggleButtonBarSelectionMouseController class is a
controller for
+ * org.apache.royale.jewel.ToggleButtonBar.
+ *
+ * It works like ListSingleSelectionMouseController but will consider
`toggleOnClick`
+ * so when is active selectedIndex can be -1 when no button is selected
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ public class ToggleButtonBarSelectionMouseController extends
ListSingleSelectionMouseController
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ public function ToggleButtonBarSelectionMouseController()
+ {
+ }
+
+ /**
+ * @copy org.apache.royale.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.4
+ *
+ * @royaleignorecoercion org.apache.royale.jewel.ToggleButtonBar
+ */
+ override public function set strand(value:IStrand):void
+ {
+ super.strand = value;
+ toggleButtonBar = value as ToggleButtonBar;
+ }
+
+ private var toggleButtonBar:ToggleButtonBar;
+
+ /**
+ * If `toggleOnClick` is active, unselecting the current button will
make selectedIndex -1
+ */
+ override protected function
selectedHandler(event:ItemClickedEvent):void
+ {
+ if(toggleButtonBar.toggleOnClick && (event.index ==
listModel.selectedIndex))
+ {
+ event.index = -1;
+ event.data = null;
+ }
+ super.selectedHandler(event);
+ }
+ }
+}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
index e3a053b..7eb1715 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
@@ -21,7 +21,6 @@ package org.apache.royale.jewel.beads.views
COMPILE::JS
{
import org.apache.royale.events.Event;
- import org.apache.royale.jewel.ToggleButtonBar;
import
org.apache.royale.jewel.itemRenderers.ToggleButtonBarItemRenderer;
}
@@ -57,11 +56,9 @@ package org.apache.royale.jewel.beads.views
COMPILE::JS
override protected function
selectionChangeHandler(event:Event):void
{
- // var toggleButtonBar:ToggleButtonBar = buttonBar as
ToggleButtonBar;
-
var prev_ir:ToggleButtonBarItemRenderer =
dataGroup.getItemRendererAt(lastSelectedIndex) as ToggleButtonBarItemRenderer;
var ir:ToggleButtonBarItemRenderer =
dataGroup.getItemRendererAt(listModel.selectedIndex) as
ToggleButtonBarItemRenderer;
-
+
if(listModel.selectedIndex != -1)
{
if(prev_ir != ir)
@@ -69,13 +66,7 @@ package org.apache.royale.jewel.beads.views
if(prev_ir)
prev_ir.selected = false;
ir.selected = true;
- } else {
- if(listModel.selectedIndex == ir.index
&& ir.selected)
- {
- ir.selected = false;
- listModel.selectedIndex = -1;
- }
- }
+ }
}
lastSelectedIndex = listModel.selectedIndex;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
index 65daa16..2778ad3 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
@@ -86,6 +86,9 @@ package org.apache.royale.jewel.itemRenderers
}
}
+ /**
+ * Only change select if `toggleOnClick` is active or otherwise
the button is not selected
+ */
COMPILE::JS
override protected function clickHandler(event:Event):void
{
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
index c2f3e77..210225f 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
@@ -64,5 +64,6 @@ j|IconButtonBar
j|ToggleButtonBar
IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.ToggleButtonBarView")
+ IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ToggleButtonBarSelectionMouseController")
IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.ToggleButtonBarItemRenderer")
// this requires in App to define in CSS -> iconClass:
ClassReference("org.apache.royale.icons.MaterialIcon")
\ No newline at end of file
