Changeset 1039 for trunk/src/org/expeditee/gui/FrameGraphics.java

Timestamp:

04/27/16 14:15:47 (8 years ago)

Author:

davidb

Message:

Main Addition: full-screen audience mode. Also some whitespace and comment tidy-up.

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (4 diffs)

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

@@ -24 +24 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.Image;
@@ -69 +70 @@
 
         public static final int MODE_XRAY = 2;
-
-        // Start in XRay mode so that errors aren't thrown when parsing the profile
-        // frame if it has images on it
+        
+        public static final int MODE_AUDIENCE_FULLSCREEN = 4;
+        
+
+        // The following used to be true in the past:
+        //   Start in XRay mode so that errors aren't thrown when parsing the profile
+        //   frame if it has images on it
+        // More recently, so Exploratory Search starts up correctly with images
+        // rendered (rather than their @i form) the following assignment was changed
+        // to MODE_AUDIENCE.  No issue of parse errors has not been seen
         private static int _Mode = MODE_AUDIENCE;
 
@@ -87 +95 @@
                         ToggleXRayMode();
                 }
-
-                if (_Mode == MODE_AUDIENCE) {
+        
+
+                if (_Mode == MODE_AUDIENCE_FULLSCREEN) {
                         _Mode = MODE_NORMAL;
-                } else {
+                        DisplayIO.leaveFullScreenMode();
+                }
+                else if (_Mode == MODE_AUDIENCE) {
+                        if (DisplayIO.fullScreenCapable()) {
+                                // Don't need to worry about UpdateConnectedToAnnotations, as this
+                                // will have already been taken care of going to the 'first stage' of
+                                // audience mode (MODE_AUDIENCE)
+                                _Mode = MODE_AUDIENCE_FULLSCREEN;
+                                DisplayIO.enterFullScreenMode();
+                        }
+                        else {
+                                // return to normal mode
+                                _Mode = MODE_NORMAL;
+                        }
+                } 
+                else { // must currently be in regular mode => move to audience mode
                         _Mode = MODE_AUDIENCE;
                         ItemUtils.UpdateConnectedToAnnotations(current.getItems());
@@ -143 +167 @@
          */
         public static boolean isAudienceMode() {
-                return _Mode == MODE_AUDIENCE;
+                return (_Mode == MODE_AUDIENCE) || (_Mode == MODE_AUDIENCE_FULLSCREEN);
         }