Changeset 626 for trunk/src/org/expeditee/items/widgets

Timestamp:

12/16/13 12:01:14 (11 years ago)

Author:

jts21

Message:

Make widgets pass F-keys on to Expeditee, and fix Widget resizing so they redraw correctly after resizing

File:

• trunk/src/org/expeditee/items/widgets/InteractiveWidget.java (modified) (5 diffs)

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -8 +8 @@
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.event.ContainerEvent;
+import java.awt.event.ContainerListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -25 +30 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MouseEventRouter;
@@ -39 +45 @@
  * 
  */
-public abstract class InteractiveWidget {
+public abstract class InteractiveWidget implements ContainerListener, KeyListener {
 
         protected JComponent _swingComponent;
@@ -431 +437 @@
 
                 _swingComponent = component;
+                _swingComponent.addContainerListener(this);
+                keyListenerToChildren(_swingComponent, true);
+                
                 _textRepresentation = source;
 
@@ -1749 +1758 @@
         }
         
+        /**
+         * Makes sure we add our KeyListener to every child component,
+         * since it seems that's the only way to make sure we capture key events in Java
+         * (without using KeyBindings which seem to only support the keyTyped event)
+         */
+        @Override
+        public void componentAdded(ContainerEvent e) {
+                if(e == null || e.getChild() == null) {
+                        return;
+                }
+                keyListenerToChildren(e.getChild(), true);
+        }
+        
+        @Override
+        public void componentRemoved(ContainerEvent e) {
+                if(e == null || e.getChild() == null) {
+                        return;
+                }
+                keyListenerToChildren(e.getChild(), false);
+        }
+        
+        @Override
+    public void keyTyped(KeyEvent e) {
+                
+                int keyCode = e.getKeyCode();
+        
+        if (keyCode >= KeyEvent.VK_F1 && keyCode <= KeyEvent.VK_F12) {
+                FrameKeyboardActions.getInstance().keyTyped(e);
+        }
+    }
+
+        @Override
+    public void keyPressed(KeyEvent e) {
+        int keyCode = e.getKeyCode();
+        
+        if (keyCode >= KeyEvent.VK_F1 && keyCode <= KeyEvent.VK_F12) {
+                FrameKeyboardActions.getInstance().keyPressed(e);
+        }
+    }
+    
+        @Override
+    public void keyReleased(KeyEvent e) {
+                int keyCode = e.getKeyCode();
+        
+        if (keyCode >= KeyEvent.VK_F1 && keyCode <= KeyEvent.VK_F12) {
+                FrameKeyboardActions.getInstance().keyReleased(e);
+        }
+    }
+        
+        private void keyListenerToChildren(Component parent, boolean add) {
+                List<Component> components = new LinkedList<Component>();
+                components.add(parent);
+                while(!components.isEmpty()) {
+                        Component c = components.remove(0);
+                        if(c instanceof Container) {
+                                components.addAll(Arrays.asList(((Container)c).getComponents()));
+                        }
+                        if(add && !Arrays.asList(c.getKeyListeners()).contains(this)) {
+                                c.addKeyListener(this);
+                        } else if (!add && Arrays.asList(c.getKeyListeners()).contains(this)) {
+                                c.removeKeyListener(this);
+                }
+                }
+        }
+        
+        public void onResized() {
+                invalidateSelf();
+        onBoundsChanged();
+        layout(_swingComponent);
+        }
+        
 }