This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 966ae3273127e448f7e4ded12da5139bfd023330 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 29 10:57:20 2014 +0100 fixes #3604: BlockerLayerUI[2] does not block MouseWheelEvent --- .../java/jaxx/runtime/swing/BlockingLayerUI.java | 30 ++++++++++++++++++++++ .../java/jaxx/runtime/swing/BlockingLayerUI2.java | 6 +++++ 2 files changed, 36 insertions(+) diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java index 6397ef6..1729e0d 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java @@ -36,6 +36,7 @@ import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; import java.awt.image.BufferedImage; import java.util.Arrays; import java.util.List; @@ -276,6 +277,35 @@ public class BlockingLayerUI extends AbstractLayerUI<JComponent> { } @Override + protected void processMouseWheelEvent(MouseWheelEvent e, JXLayer<? extends JComponent> l) { + + if (useIcon) { + + e.consume(); + return; + } + + if (block) { + Object source = e.getSource(); + if (!(source instanceof JComponent)) { + e.consume(); + return; + } + JComponent comp = (JComponent) source; + String compName = comp.getName(); + if (acceptedComponentNames == null || + !acceptedComponentNames.contains(compName)) { + e.consume(); + return; + } + + acceptEvent(e, l); + + } + + } + + @Override protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { super.paintLayer(g2, l); if (block && blockingColor != null) { diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java index afaef77..0dc712b 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java @@ -36,6 +36,7 @@ import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; import java.awt.image.BufferedImage; /** @@ -151,6 +152,11 @@ public class BlockingLayerUI2 extends AbstractLayerUI<JComponent> { } @Override + protected void processMouseWheelEvent(MouseWheelEvent e, JXLayer<? extends JComponent> l) { + e.consume(); + } + + @Override protected void processMouseEvent(MouseEvent e, JXLayer<? extends JComponent> l) { switch (e.getID()) { case MouseEvent.MOUSE_ENTERED: -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.