Changeset 1220 for trunk/src

Timestamp:

01/30/19 13:04:22 (5 years ago)

Author:

bln4

Message:

FrameUtils.java -> Ability to detect the cursor is over something in the MailBay.

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (5 diffs)

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

@@ -40 +40 @@
 import java.util.zip.ZipEntry;
 
+import org.expeditee.auth.gui.MailBay;
 import org.expeditee.core.Colour;
 import org.expeditee.core.Point;
@@ -1209 +1210 @@
          * @return The Item at the given coordinates, or NULL if none is found.
          */
-        public static Item onItem(Frame toCheck, float floatX, float floatY, boolean bResetLastEdited)
-        {
+        public static Item onItem(Frame toCheck, float floatX, float floatY, boolean bResetLastEdited) {
                 // System.out.println("MouseX: " + floatX + " MouseY: " + floatY);
                 int x = Math.round(floatX);
@@ -1222 +1222 @@
                 // if the mouse is in the message area
                 if (y >= DisplayController.getMessageBayPaintArea().getMinY()) {
-                        // check the individual message items
-                        for (Item message : MessageBay.getMessages()) {
+                        // check the individual bay items (MessageBay + MailBay)
+                        List<Item> bayItems = new LinkedList<Item>();
+                        if (DisplayController.isMailMode()) {
+                                bayItems.addAll(MailBay.getPreviewMessages());
+                        } else {
+                                bayItems.addAll(MessageBay.getMessages());
+                        }
+                        for (Item message : bayItems) {
                                 if (message != null) {
                                         if (message.contains(new Point(x, y))) {
@@ -1237 +1243 @@
                         }
 
-                        // check the link to the message frame
-                        if (MessageBay.getMessageLink() != null) {
-                                if (MessageBay.getMessageLink().contains(new Point(x, y))) {
-                                        MessageBay.getMessageLink().setOverlayPermission(UserAppliedPermission.copy);
-                                        possibles.add(MessageBay.getMessageLink());
-                                }
+                        // check the link to the message/mail frame
+                        Item linkItem = DisplayController.isMailMode() ? MailBay.getMailLink() : MessageBay.getMessageLink();
+                        if (linkItem != null && linkItem.contains(new Point(x, y))) {
+                                linkItem.setOverlayPermission(UserAppliedPermission.copy);
+                                possibles.add(linkItem);
                         }
 
@@ -1287 +1292 @@
                                                         }
                                                 }
-                                        }
-                                        
-                                        if (i.getData() != null && !i.getData().isEmpty() && i.getText().isEmpty()) {
-                                                System.err.println();
                                         }