Changeset 26757

Timestamp:

2013-01-20T15:19:25+13:00 (11 years ago)

Author:

davidb

Message:

Fixed bug with Audience Mode not working in GlamED. Need to check if the current frame displayed is a collection item frame. If not then just run Audience Mode as per normal, otherwise need to hide any visible overlays such as the toolbar and "view/hide toolbar" button.

File:

• other-projects/GlamED/trunk/src/org/honours/gui/KeyboardActions.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import org.expeditee.gui.FrameKeyboardActions;
 import org.honours.actions.MiscActions;
+import org.honours.collection.Collection;
 
 public class KeyboardActions implements KeyListener{
@@ -27 +28 @@
         
         int keyCode = e.getKeyCode();
-        //Frame currFrame = DisplayIO.getCurrentFrame();
+        Frame currFrame = DisplayIO.getCurrentFrame();
+        Collection coll = Collection.findCollection(currFrame);
         
-        //TODO:Check if current frame is a "content-layer"
-        
+        if(coll != null){
         //If F9 (Audience Mode button) has been pressed.
         if(keyCode == KeyEvent.VK_F9){
@@ -53 +54 @@
         }
         
-                
+        }       
         FrameKeyboardActions.getInstance().keyPressed(e);
     }