Changeset 144:d6db753b7c78

Timestamp:

08/02/2008 10:18:23 AM (4 months ago)

Author:

marc@f1.local

branch:

default

Message:

tweaked focus policy for bug #90

Files:

• development/java/field/core/ui/FloatingPalettes.java (modified) (8 diffs)
• development/java/field/core/ui/Quaqua15TigerLookAndFeelField.java (modified) (2 diffs)
• development/java/field/core/ui/text/BaseTextEditor2.java (modified) (1 diff)
• distribution/application/field.app/Contents/Info.plist (modified) (2 diffs)

development/java/field/core/ui/FloatingPalettes.java

@@ -1 +1 @@
-package field.core.ui;
-
+import java.awt.Component;
-import java.awt.Frame;
+import java.awt.KeyboardFocusManager;
-import java.awt.Window;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.lang.ref.WeakReference;
-import java.nio.channels.OverlappingFileLockException;
-import java.util.ArrayList;
-import java.util.List;
-
-javax.swing.JFrame
-
+field.bytecode.protect.Woven
+
-import field.core.ui.Quaqua15TigerLookAndFeelField.ToolPalette;
-import field.graphics.windowing.OverlayCanvas;
-import field.launch.Launcher;
-import field.launch.iUpdateable;
@@ -22 +22 @@
-        static List<WeakReference<Frame>> palettes = new ArrayList<WeakReference<Frame>>();
-        static MutableFloat in = new MutableFloat(0);
-
+
-        static public boolean suspendRegistration = false;
-
-        static public void registerFloatingPalette(Frame frame) {
-
-
+
+
+
-                palettes.add(new WeakReference<Frame>(frame));
-                frame.addWindowListener(new WindowListener() {
@@ -33 +34 @@
-                        List<WeakReference<Frame>> palettes = FloatingPalettes.palettes;
-                        MutableFloat in = FloatingPalettes.in;
-
+
-                        public void windowActivated(WindowEvent e) {
-                                if (e.getOppositeWindow() != null && (e.getOppositeWindow().getClass().getName().contains("OverlayCanvas") || e.getOppositeWindow().getClass().getName().contains("PopupInfoWindow"))) {
@@ -49 +50 @@
-
-                        public void windowDeactivated(WindowEvent e) {
- 
+
-                                } else if (palletteOf(e.getOppositeWindow(), palettes)) {
-                                } else {
@@ -71 +72 @@
-
-                FloatingPalettes.palettes = new ArrayList<WeakReference<Frame>>();
-
+ 
-
-                Launcher.getLauncher().registerUpdateable(new iUpdateable() {
-                        List<WeakReference<Frame>> palettes = FloatingPalettes.palettes;
-                        MutableFloat in = FloatingPalettes.in;
-
+
+
+
+
+
-                        public void update() {
-                                if (in.d > 0) {
+                                        if (!edge) {
+                                                restoreFocus(focus);
+                                        }
+                                        Component focus2 = saveFocus();
+                                        if (focus2 != null)
+                                                focus = focus2;
+                                        edge = true;
-                                        moveIn(palettes);
-
+
+
+
+
-                                        moveOut(palettes);
+                                }
-                                if (in.d < 0)
-                                        in.d = 0;
@@ -87 +103 @@
-                                        in.d = 1;
-                        }
+
+                        @Woven
+                        @NextUpdate(delay = 5)
+                        private void restoreFocus(final Component focus2) {
+                                if (focus2 != null) {
+                                        // completely crazy! Why do I have to
+                                        // keep asking for the focus until I get
+                                        // it?
+                                        Launcher.getLauncher().registerUpdateable(new iUpdateable() {
+
+                                                int n = 0;
+
+                                                public void update() {
+
+                                                        n++;
+                                                        focus2.requestFocus();
+                                                        if (focus2.isFocusOwner() || n > 5) {
+                                                                Launcher.getLauncher().deregisterUpdateable(this);
+                                                        }
+                                                }
+                                        });
+                                }
+                        }
+
+                        private Component saveFocus() {
+                                return KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+                        }
-                });
-
+
-                FloatingPalettes.palettes.add(new WeakReference<Frame>(frame));
-                frame.addWindowListener(new WindowListener() {
@@ -96 +139 @@
-
-                        public void windowActivated(WindowEvent e) {
- 
+
-                                } else if (palletteOf(e.getOppositeWindow(), palettes)) {
-                                } else {
-                                        in.d++;
-                                }
+//
+//                              if (e.getOppositeWindow()!=null)
+//                              {
+//                                      System.out.println(" oposite is <"+e.getOppositeWindow()+"> <"+e.getSource()+">");
+//                              }
-                        }
-
@@ -110 +158 @@
-
-                        public void windowDeactivated(WindowEvent e) {
- 
+
-                                } else if (palletteOf(e.getOppositeWindow(), palettes)) {
-                                } else {

development/java/field/core/ui/Quaqua15TigerLookAndFeelField.java

@@ -74 +74 @@
-                float lastOpacity = -1f;
-
+                boolean hadFocusOnHide = false;
-
-                public ToolPalette(String title) throws HeadlessException {
@@ -101 +102 @@
-                                        if (opacity < 1e-2 && opacity<lastOpacity)
-                                                if (ToolPalette.super.isVisible())
+                                                {
-                                                        ToolPalette.super.show(false);
+                                                }
-                                        if (opacity > 1e-2 && opacity>lastOpacity)
-                                                if (!ToolPalette.super.isVisible())
+                                                {
-                                                        ToolPalette.super.show(true);
+                                                }
-
-                                        if (Math.abs(lastOpacity-opacity)>0.01 || (opacity==0 && lastOpacity!=0) || (opacity==1 && lastOpacity!=1))

development/java/field/core/ui/text/BaseTextEditor2.java

@@ -617 +617 @@
-                        }
-
+                        @Override
+                        public boolean isFocusable() {
+                                return true;
+                        }
-                };
-

distribution/application/field.app/Contents/Info.plist

@@ -145 +145 @@
-                        <key>forceNativeBuffers</key>
-                        <string>1</string>
+                        <key>java.library.path</key>
+                        <string>$JAVAROOT:$JAVAROOT/../../../../extensions/</string>
-                        <key>java.source.paths</key>
-                        <string>$JAVAROOT/../../../../../../development/java:/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar</string>
@@ -167 +169 @@
-                </dict>
-                <key>VMOptions</key>
-
+debug -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n -X
-                <key>WorkingDirectory</key>
-                <string>$APP_PACKAGE/Contents/Resources/Java</string>