Changeset 942

Timestamp:

12/09/14 15:12:31 (9 years ago)

Author:

bln4

Message:

The beginnings of indirect controls.

Location:

trunk/src/org/expeditee/gui

Files:

• FrameMouseActions.java (modified) (5 diffs)
• indirect (added)
• indirect/mouse (added)
• indirect/mouse/IndirectMouseActions.java (added)
• indirect/mouse/MouseAction.java (added)

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

@@ -37 +37 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
@@ -51 +50 @@
 import org.expeditee.actions.Misc;
 import org.expeditee.actions.Navigation;
+import org.expeditee.gui.indirect.mouse.IndirectMouseActions;
+import org.expeditee.gui.indirect.mouse.MouseAction;
+import org.expeditee.gui.indirect.mouse.MouseAction.MouseInfo;
 import org.expeditee.io.ExpClipReader;
 import org.expeditee.io.ItemSelection;
@@ -83 +85 @@
 
         private FrameMouseActions() {
+                IndirectMouseActions.getInstance().setBackAction(new MouseAction() {
+                        @Override
+                        public void exec(MouseInfo info) {
+                                //if user is not pointing at something,this is a back
+                                if (info.isControlDown || info.isShiftDown)
+                                        forward();
+                                else
+                                        back();
+                        }
+                });
         }
 
@@ -265 +277 @@
         }
 
-        public void ProccessMousePressedEvent(MouseEvent e, int modifiersEx) {
+        private void ProccessMousePressedEvent(MouseEvent e, int modifiersEx) {
                 // System.out.println("MousePressed " + e.getX() + "," + e.getY() + " "
                 // + e.getWhen());
@@ -894 +906 @@
 
                 } else {
-
+                        IndirectMouseActions.getInstance().getBackAction().exec(new MouseInfo(clicked, clickedIn, isShiftDown, isControlDown));
                         // if user is not pointing at something,this is a back
-                        if (isShiftDown || isControlDown)
-                                forward();
-                        else
-                                back();
-
+//                      if (isShiftDown || isControlDown)
+//                              forward();
+//                      else
+//                              back();
                 }
         }