Changeset 21 for trunk/src/org/expeditee/gui/DisplayIO.java

Timestamp:

05/08/08 14:30:09 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/DisplayIO.java (modified) (8 diffs)

trunk/src/org/expeditee/gui/DisplayIO.java

@@ -59 +59 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp06May2008A";
+        public static final String TITLE = "Exp08May2008B";
 
         private DisplayIO() {
@@ -88 +88 @@
                 cursorType = Item.TEXT_CURSOR;
 
-                //Do some stuff to adjust the cursor size based on the font size
+                // Do some stuff to adjust the cursor size based on the font size
                 final int MEDIUM_CURSOR_CUTOFF = 31;
                 final int LARGE_CURSOR_CUTOFF = 62;
@@ -112 +112 @@
                 }
 
-                /*System.out.println("hs: " + hotspotPos + " start: " + start + " font: "
-                                + size + " cursor: " + (cursorSize - start));*/
+                /*
+                 * System.out.println("hs: " + hotspotPos + " start: " + start + " font: " +
+                 * size + " cursor: " + (cursorSize - start));
+                 */
 
                 int[] pixels = new int[cursorSize * cursorSize];
@@ -174 +176 @@
 
         public static void setCursorPosition(int x, int y, boolean forceArrow) {
-                if (Frame.itemAttachedToCursor()) {
-                        List<Item> toMove = Frame.FreeItems;
-
-                        int deltax = x - FrameMouseActions.MouseX;
-                        int deltay = y - FrameMouseActions.MouseY;
-
-                        for (Item move : toMove) {
-                                move.setPosition(move.getX() + deltax, move.getY() + deltay);
-                        }
-
-                        // FrameGraphics.Repaint();
-
-                        // if (!item.getArea().contains(x, y))
-                        // item.setPosition(x, y);
-                }
+                int deltax = x - FrameMouseActions.MouseX;
+                int deltay = y - FrameMouseActions.MouseY;
 
                 if (_TwinFrames) {
@@ -195 +184 @@
                 }
 
-                // cheat
-                FrameMouseActions.setForceArrow(forceArrow);
-
                 // ensures the cursor doesn't fall behind while waiting for robot
                 FrameMouseActions.MouseX = x;
                 FrameMouseActions.MouseY = y;
 
-                _Robot.mouseMove((int)_Browser.getContentPane().getLocationOnScreen().getX() + x, (int)_Browser.getContentPane().getLocationOnScreen().getY() + y);
+                if (Frame.itemAttachedToCursor()) {
+                        List<Item> toMove = Frame.FreeItems;
+                        for (Item move : toMove) {
+                                move.setPosition(move.getX() + deltax, move.getY() + deltay);
+                        }
+                }
+
+                // cheat
+                FrameMouseActions.setForceArrow(forceArrow);
+                _Robot.mouseMove((int) _Browser.getContentPane().getLocationOnScreen()
+                                .getX()
+                                + x, (int) _Browser.getContentPane().getLocationOnScreen()
+                                .getY()
+                                + y);
         }
 
@@ -330 +329 @@
                                 FrameIO.ResumeCache();
                         }
-                        
+
                         // If the frames are the same then the items for the
                         // frame that is just about to hide will still be in view
                         // so only notify items that they are hidden if the
                         // frames differ.
-                        if (_CurrentFrames[getCurrentSide()] != null &&
-                                _CurrentFrames[0] != _CurrentFrames[1]) {
+                        if (_CurrentFrames[getCurrentSide()] != null
+                                        && _CurrentFrames[0] != _CurrentFrames[1]) {
                                 for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
-                                        i.onParentFameHidden(); 
+                                        i.onParentFameHidden();
                                 }
                         }
                         _CurrentFrames[getCurrentSide()] = frame;
-                        
-                        // BROOK 
+
+                        // BROOK
                         for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
                                 i.onParentFameShown();
                         }
                 } else {
-                        // Notifying items on the frame being hidden that they 
+                        // Notifying items on the frame being hidden that they
                         // are about to be hidden.
                         // ie. Widgets use this method to remove themselves from
-                        //the JPanel
+                        // the JPanel
                         if (_CurrentFrames[getCurrentSide()] != null) {
                                 for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
-                                        i.onParentFameHidden(); 
+                                        i.onParentFameHidden();
                                 }
                         }
-                        
+
                         _CurrentFrames[getCurrentSide()] = frame;
                         frame.setMaxSize(FrameGraphics.getMaxFrameSize());
-                
+
                         // Notify items on the frame being displayed that they are in view
-                        //ie. widgets use this method to add themselves to the content pane
+                        // ie. widgets use this method to add themselves to the content pane
                         for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
                                 i.onParentFameShown();
@@ -369 +368 @@
 
                 FrameGraphics.Repaint();
-                UpdateTitle();
         }
 
@@ -539 +537 @@
                         if (i.getLink() != null
                                         && i.getAbsoluteLink().toLowerCase().equals(oldFrame)) {
-                                i.showHighlight(true, BACK_HIGHLIGHT_COLOR);
-                                //check if its an @f item and if so update the buffer
+                                i.setSelectedMode(Item.SelectedMode.Normal,
+                                                BACK_HIGHLIGHT_COLOR);
+                                // check if its an @f item and if so update the buffer
                                 if (i instanceof Picture) {
-                                        Picture p = (Picture)i;
+                                        Picture p = (Picture) i;
                                         p.refresh();
                                 }