Changeset 26717

Timestamp:

2013-01-14T17:43:14+13:00 (11 years ago)

Author:

davidb

Message:

Changed positioning of overlay link items.

Location:

other-projects/GlamED/trunk/src/org/honours

Files:

• Main.java (modified) (2 diffs)
• gui/HonoursFrameIO.java (modified) (1 diff)
• gui/Interfaces.java (modified) (4 diffs)

other-projects/GlamED/trunk/src/org/honours/Main.java

@@ -82 +82 @@
         
         //Set up main overlay display
+        //Interfaces.setUpOverlayLocations();
         Interfaces.setUpMainOverlay(_profile);
         
@@ -147 +148 @@
                 
                 for(CollectionItem cItem : c.getItems()){
+                    
+                    Interfaces.setUpOverlayLocations(cItem);
                     Interfaces.setUpToolbarOverlay(cItem);
                     Interfaces.setUpToggleToolbarOverlay(cItem);

other-projects/GlamED/trunk/src/org/honours/gui/HonoursFrameIO.java

@@ -160 +160 @@
             MessageBay.errorMessage("No notes to display");
             
-            //TODO: Create new note layer here?
             
             return;

other-projects/GlamED/trunk/src/org/honours/gui/Interfaces.java

@@ -1 +1 @@
 package org.honours.gui;
 
+import java.awt.Dimension;
 import java.util.List;
 
 import org.expeditee.gui.*;
+import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 
@@ -48 +50 @@
     private static String _overlayAnnotationData = "overlay-annotation";
     
-    
-    /** Method to set up overlay locations relative to the screen size. **/
-    public static void setUpOverlayLocations(){
-        
-    }
-    
     /**
      * This method sets up the main overlay on the profile
@@ -61 +57 @@
     public static void setUpMainOverlay(Frame frame){
         
+        
+        
         List<Text> list = frame.getBodyTextItems(true);
         
@@ -90 +88 @@
         
         FrameKeyboardActions.Refresh();
+    }
+    
+    
+    /** Method to set up overlay locations relative to the screen size. **/
+    public static void setUpOverlayLocations(CollectionItem cItem){
+        
+        Frame frame = cItem.getFrame();
+        //Dimension dim = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
+        
+        //Find the location of the frame name text item and use that for the overlay links.
+        Item nameItem = frame.getNameItem();
+        
+        int x = nameItem.getX();
+        
+        _mainOverAoX = x;
+        _toolbarAoX = x;
+        _toggleAoX = x;
+        _notesAoX = x;
+        
+    }
+    
+    public static void resetOverlayPosition(Text t) {
+        Dimension maxSize = FrameGraphics.getMaxFrameSize();
+        if (maxSize != null) {
+            // setMaxWidth(maxSize.width);
+            t.setPosition(maxSize.width - t.getBoundsWidth(), t.getBoundsHeight());
+        }
     }