Changeset 998 for trunk/src

Timestamp:

02/05/16 09:49:02 (8 years ago)

Author:

davidb

Message:

Added new versions of last commit that have been tidied up

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (1 diff)
• Frame.java (modified) (1 diff)
• FrameMouseActions.java (modified) (2 diffs)
• FrameUtils.java (modified) (2 diffs)

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

@@ -197 +197 @@
             try
         {
-          URL iconURL = ClassLoader.getSystemResource("org/expeditee/assets/icons/expediteeicon128.png"); //this is ideal
+          URL iconURL = ClassLoader.getSystemResource("org/expeditee/assets/icons/expediteeicon128.png");
           if (iconURL != null)
           {

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

@@ -2370 +2370 @@
                  * every time this method is called
                  */
-                //if (_interactableItems.size() > 0)
-                //      return _interactableItems;
+                if (_interactableItems.size() > 0)
+                        return _interactableItems;
 
                 for (Item i : _body) {

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

@@ -1365 +1365 @@
                                         
                                         //Should call a button widgets 'itemheldwhileclicked' method, and process depending on the widget type - else will return false.
-                                        if(bw.itemHeldWhileClicked((InteractiveWidget)bw) == true){             
-                                        //if(bw.ItemsLeftClickDropped() == true){                                               
+                                        if(bw.itemHeldWhileClicked((InteractiveWidget)bw) == true){                                                                     
                                                 
                                                 return;
@@ -2379 +2378 @@
                                 // FrameGraphics.ChangeSelectionMode(on,
                                 // Item.SelectedMode.Connected);
-                                // TODO: The method below is for the most part redundant
-                                
-                                //start a timer to check how long mouse hovers over item for
-                                //java.util.Timer timer = new java.util.Timer();
-                                //timer.schedule(new TimerTask() {
-                                          //@Override
-                                          //public void run() {
-                                            
-                                                  //System.out.println("The mouse hovered over an item for 3 seconds");
-                                         //}
-                                        //}, 10000);
-                                
-                                
-                                
+                                // TODO: The method below is for the most part redundant                                
                                 
                                 on = FrameGraphics.Highlight(on.getEditTarget());

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

@@ -63 +63 @@
 import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
-import org.expeditee.items.widgets.RubbishBin;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -1228 +1227 @@
                         
                 // do not check annotation items in audience mode
+            //TODO: Upon hover of Rubbish Bin, Undo and Restore Widgets, flickering occurs depending on the mouse distance from a corner. Resolve this.
                 if (i.isVisible()
                         && !(FrameGraphics.isAudienceMode() && i.isAnnotation())) {