Changeset 1187 for trunk/src/org/expeditee/gio

Timestamp:

10/31/18 10:20:25 (6 years ago)

Author:

bln4

Message:

Updated how the SwingInputManager deals with popups so that the call to focus can be re-enabled.

Location:

trunk/src/org/expeditee/gio/swing

Files:

• MouseEventRouter.java (modified) (4 diffs)
• SwingInputManager.java (modified) (7 diffs)

trunk/src/org/expeditee/gio/swing/MouseEventRouter.java

@@ -33 +33 @@
 import java.util.List;
 
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JMenuBar;
-import javax.swing.JPopupMenu;
 import javax.swing.SwingUtilities;
 
@@ -280 +280 @@
                                         if (g.getContentPane() != null) {
                                                 if (!g.getContentPane().isFocusOwner() && !isPopupVisible()) {
-                                                        //g.getContentPane().requestFocus();
+                                                        g.getContentPane().requestFocus();
                                                 }
                                         }
@@ -381 +381 @@
 //              for (Component c : parent.getComponents()) {
 //                      if (c instanceof JPopupMenu && ((JPopupMenu) c).isVisible()) {
+//                              System.err.println("Popup visible");
 //                              return true;
 //
@@ -386 +387 @@
 //                                      && c != SwingMiscManager.getIfUsingSwingGraphicsManager().getContentPane()) {
 //                              if (isPopupVisible((Container) c)) {
+//                                      System.err.println("Popup visible");
 //                                      return true;
 //                              }
 //                      }
 //              }
-//
+//              System.err.println("Popup not visible");
 //              return false;
 //      }
         
         private static boolean isPopupVisible(final JComponent parent) {
-                final JPopupMenu popup = parent.getComponentPopupMenu();
-                if(popup != null) {
-                        System.err.println("Here");
-                }
-                if(popup != null && popup.isVisible()) {
-                        return true;
-                } else {
-                        for (final Component c : parent.getComponents()) {
-                                if(c instanceof JComponent && isPopupVisible((JComponent) c)) {
-                                        return true;
-                                }
+                if(parent instanceof JComboBox) {
+                        if(((JComboBox<?>) parent).isPopupVisible()) { return true; }
+                } 
+                for (final Component c : parent.getComponents()) {
+                        if(c instanceof JComponent && isPopupVisible((JComponent) c)) {
+                                //System.err.println("MouseEventRouter::found visible popup");
+                                return true;
                         }
                 }
                 return false;
         }
+        
+//      private static boolean isPopupVisible(final JComponent parent) {
+//              final JPopupMenu popup = parent.getComponentPopupMenu();
+//              if(popup != null) {
+//                      System.err.println("Found control with popup");
+//              }
+//              if(popup != null && popup.isVisible()) {
+//                      System.err.println("Popup visible");
+//                      return true;
+//              } else {
+//                      for (final Component c : parent.getComponents()) {
+//                              if(c instanceof JComponent && isPopupVisible((JComponent) c)) {
+//                                      System.err.println("Popup visible");
+//                                      return true;
+//                              }
+//                      }
+//              }
+//              System.err.println("Popup not visible");
+//              return false;
+//      }
 
         private MouseEvent duplicateMouseEvent(MouseEvent e, int modifiers) {

trunk/src/org/expeditee/gio/swing/SwingInputManager.java

@@ -21 +21 @@
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
+import java.util.List;
 
 import javax.swing.SwingUtilities;
@@ -348 +349 @@
         @Override
         public void keyTyped(KeyEvent e) {
+                //System.err.println("SwingInputManager::keyTyped::KeyEvent: " + e.getKeyChar());
                 // Give widgets first whack at input
                 distributeNativeInput(e);
                 if (e.isConsumed()) {
+                        //System.err.println("SwingInputManager::keyTyped::Widget/Popup Consumed KeyEvent");
                         return;
                 }
@@ -383 +386 @@
         /** Handles key pressed/released events. */
         private void keyAction(KeyEvent e, boolean down) {
+                //System.err.println("SwingInputManager::keyAction::KeyEvent: " + e.getKeyChar());
                 // Give widgets first whack at input
                 distributeNativeInput(e);
                 if (e.isConsumed()) {
-                        return;
-                }
+                        //System.err.println("SwingInputManager::keyAction::Was consumed: " + e.isConsumed());
+                        return;
+                }
+                //System.err.println("SwingInputManager::keyAction::Was consumed: " + e.isConsumed());
 
                 KBMInputEvent.Key key = SwingConversions.fromSwingVirtualKey(e.getKeyCode());
@@ -418 +424 @@
         /** Forwards the given input event to the listener if it is listening for it. */
         private void forwardNativeInputToListener(Object listener, java.awt.event.InputEvent event) {
+                //System.err.println("SwingInputManager::forwardNativeInputToListener");
                 if (listener == null || event == null) {
                         return;
                 }
-
+                //System.err.println("SwingInputManager::forwardNativeInputToListener::Recieving input: " + event.toString());
                 if (listener instanceof KeyListener && event instanceof KeyEvent) {
 
@@ -435 +442 @@
                                 return;
                         case KeyEvent.KEY_TYPED:
+                                //System.err.println("SwingInputManager::forwardNativeInputToListener::Recieving key typed: " + event.toString());
                                 keyListener.keyTyped(ke);
                                 return;
@@ -505 +513 @@
                         return;
                 }
-
-                for (Popup popup : PopupManager.getInstance().getPopups()) {
+                final List<Popup> popups = PopupManager.getInstance().getPopups();
+                for (Popup popup : popups) {
                         forwardNativeInputToListener(popup, event);
 
@@ -520 +528 @@
                         return;
                 }
-
                 for (Widget iw : _widgets) {
                         java.awt.event.InputEvent e = respecInputEventForWidget(event, iw);