Changeset 1216 for trunk/src

Timestamp:

01/30/19 13:02:05 (5 years ago)

Author:

bln4

Message:

DisplayController.java -> Ability to Enter and check if the MailBay is currently shown. When a message is received in the MessageBay, it gets screen

File:

• trunk/src/org/expeditee/gui/DisplayController.java (modified) (9 diffs)

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

@@ -28 +28 @@
 import java.util.function.BooleanSupplier;
 
+import org.expeditee.auth.gui.MailBay;
 import org.expeditee.core.Clip;
 import org.expeditee.core.Colour;
@@ -117 +118 @@
         private static boolean _audienceMode = false;
         
+        /** Whether we are currently displaying mail mode whilst not in audience mode */
+        private static boolean _mailMode = false;
+        
         /** Whether we are currently displaying in x-ray mode. */
         private static boolean _xrayMode = false;
@@ -232 +236 @@
         public static void setTextCursor(Text text, int cursorMovement,
                         boolean newSize, boolean isShiftDown, boolean isCtrlDown,
-                        boolean allowClearSelection)
-        {
+                        boolean allowClearSelection) {
 
                 int size = Math.round(text.getSize());
@@ -243 +246 @@
                 Point newMouse = text.moveCursor(cursorMovement, DisplayController.getFloatMouseX(), EcosystemManager.getInputManager().getCursorPosition().getY(), isShiftDown, isCtrlDown);
                                                 
-                if(             isCtrlDown ||
-                                (DisplayController.getFloatMouseX() <= newMouse.getX() && newMouse.getX() <= DisplayController.getFloatMouseX() + 1) ||
-                                (DisplayController.getFloatMouseX() > newMouse.getX() && cursorMovement == Text.RIGHT))
+                if( isCtrlDown ||
+                        (DisplayController.getFloatMouseX() <= newMouse.getX() && newMouse.getX() <= DisplayController.getFloatMouseX() + 1) ||
+                        (DisplayController.getFloatMouseX() > newMouse.getX() && cursorMovement == Text.RIGHT))
                 {
                         if(cursorMovement == Text.RIGHT && !MagneticConstraints.getInstance().rightBorderHit(text)) {
@@ -1152 +1155 @@
                 requestRefresh(false);
         }
+        
+        /**
+         * If Mail Mode is on, this method will toggle it to be off, or vice-versa.
+         * This results in the Frame being re-parsed and repainted.
+         */
+        public static void ToggleMailMode() {
+                Frame current = DisplayController.getCurrentFrame();
+                
+                // Turn off x-ray mode if it's on
+                if (_xrayMode) {
+                        ToggleXRayMode();
+                }
+                
+                _mailMode = !_mailMode;
+                
+                refreshPaintAreas();
+                FrameUtils.Parse(current);
+                updateTitle();
+                requestRefresh(false);
+        }
+        
+        /**
+         * Turns Mail Mode off.
+         * This results in the Frame being re-parsed and repainted.
+         */
+        public static void DisableMailMode() {
+                Frame current = DisplayController.getCurrentFrame();
+                
+                // Turn off x-ray mode if it's on
+                if (_xrayMode) {
+                        ToggleXRayMode();
+                }
+                
+                _mailMode = false;
+                
+                refreshPaintAreas();
+                FrameUtils.Parse(current);
+                updateTitle();
+                requestRefresh(false);
+        }
 
         /**
@@ -1184 +1227 @@
                 return _audienceMode;
         }
+                
+        /** Whether mail mode is currently on. */
+        public static boolean isMailMode() {
+                return _mailMode;
+        }
 
         /** Whether x-ray mode is currently on. */
@@ -1258 +1306 @@
                 if (ItemUtils.isVisible(damagedItem)) {
                         invalidateArea(AxisAlignedBoxBounds.getEnclosing(toRepaint));
-                } else if (MessageBay.isMessageItem(damagedItem)) {
+                } else if (!_mailMode && MessageBay.isMessageItem(damagedItem)) {
+                        invalidateArea(AxisAlignedBoxBounds.getEnclosing(toRepaint).translate(0, getMessageBayPaintArea().getMinY()));
+                } else if (_mailMode && MailBay.isPreviewMailItem(damagedItem)) {
                         invalidateArea(AxisAlignedBoxBounds.getEnclosing(toRepaint).translate(0, getMessageBayPaintArea().getMinY()));
                 }
@@ -1343 +1393 @@
                 }
 
-                // Paint message bay
                 if (!isAudienceMode()) {
-                        Clip messageBayClip = null;
-                        
-                        AxisAlignedBoxBounds messageBayPaintArea = getMessageBayPaintArea();
-                        if (useInvalidation) {
-                                messageBayClip = clip.clone().intersectWith(messageBayPaintArea);
-                                if (!messageBayClip.isFullyClipped()) {
-                                        messageBayClip = new Clip(messageBayClip.getBounds().translate(0, -messageBayPaintArea.getMinY()));
-                                }
-                        }
-                        
-                        Image image = null;
-                        if (!useInvalidation || !messageBayClip.isFullyClipped()) {
-                                image = MessageBay.getImage(messageBayClip, messageBayPaintArea.getSize());
-                        }
-                        
-                        if (image != null) {
-                                g.drawImage(image, messageBayPaintArea.getTopLeft(), messageBayPaintArea.getSize());
+                        if (!isMailMode()) {
+                                // Paint message bay
+                                paintMessageBay(useInvalidation, clip, g);
+                        } else {
+                                // Paint mail bay
+                                paintMailBay(useInvalidation, clip, g);
                         }
                 }
@@ -1378 +1416 @@
                 return true;
         }
-        
+
+        private static void paintMessageBay(boolean useInvalidation, Clip clip, GraphicsManager g) {
+                Clip messageBayClip = null;
+                
+                AxisAlignedBoxBounds messageBayPaintArea = getMessageBayPaintArea();
+                if (useInvalidation) {
+                        messageBayClip = clip.clone().intersectWith(messageBayPaintArea);
+                        if (!messageBayClip.isFullyClipped()) {
+                                messageBayClip = new Clip(messageBayClip.getBounds().translate(0, -messageBayPaintArea.getMinY()));
+                        }
+                }
+                
+                Image image = null;
+                if (!useInvalidation || !messageBayClip.isFullyClipped()) {
+                        image = MessageBay.getImage(messageBayClip, messageBayPaintArea.getSize());
+                }
+                
+                if (image != null) {
+                        g.drawImage(image, messageBayPaintArea.getTopLeft(), messageBayPaintArea.getSize());
+                }
+        }
+        
+        private static void paintMailBay(boolean useInvalidation, Clip clip, GraphicsManager g) {
+                Clip mailBayClip = null;
+                
+                AxisAlignedBoxBounds mailBayPaintArea = getMessageBayPaintArea();
+                if (useInvalidation) {
+                        mailBayClip = clip.clone().intersectWith(mailBayPaintArea);
+                        if (!mailBayClip.isFullyClipped()) {
+                                mailBayClip = new Clip(mailBayClip.getBounds().translate(0, -mailBayPaintArea.getMinY()));
+                        }
+                }
+                
+                Image image = null;
+                if (!useInvalidation || !mailBayClip.isFullyClipped()) {
+                        image = MailBay.getImage(mailBayClip, mailBayPaintArea.getSize());
+                }
+                
+                if (image != null) {
+                        g.drawImage(image, mailBayPaintArea.getTopLeft(), mailBayPaintArea.getSize());
+                }
+        }
+
         /** Draws the two frame images to the display and puts the separator line between them. */
         private static void paintTwinFrames(Image leftFrameImage, Image rightFrameImage)