Changeset 1102 for trunk/src/org/expeditee/gui/Help.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

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

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

@@ -26 +26 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
 import org.expeditee.settings.experimental.ExperimentalFeatures;
-
 
 public class Help {
@@ -120 +119 @@
                         if((mod & shift) == 0)return "Extend line";
                         break;
+                default:
+                        break;
                 }
                 if((other & cursor) != 0) return "Stamp copy";
@@ -152 +153 @@
                         }
                         break;
+                default:
+                        break;
                 }
                 return "Delete";
@@ -165 +168 @@
                         if((other & cursor) == 0) return "Select text region";
                         break;
+                default:
+                        break;
                 }
                 return null;
@@ -174 +179 @@
                 case text:
                         if((other & cursor) == 0) return "Cut text region";
+                default:
+                        break;
                 }
                 return null;
@@ -187 +194 @@
                 case text:
                         if((other & cursor) == 0) return "Copy text region";
+                default:
+                        break;
                 }
                 return null;
@@ -192 +201 @@
         
         
-        public static void updateStatus() {
+        public static void updateStatus(boolean controlDown, boolean shiftDown)
+        {
                 Item current = FrameUtils.getCurrentItem();
                 Collection<Item> currents;
                 Context context;
-                InteractiveWidget iw = null;
+                Widget iw = null;
                 if(current != null) {
                         if(current instanceof Line) {
@@ -232 +242 @@
                         }
                 }
-                int mod = (FrameMouseActions.isControlDown() ? control : 0) | (FrameMouseActions.isShiftDown() ? shift : 0);
+                int mod = (controlDown ? control : 0) | (shiftDown ? shift : 0);
                 int other = (ExperimentalFeatures.MousePan.get() ? panning : 0) |
                                 (current != null && current.hasAction() ? action : 0)|
                                 (current != null && current.hasLink() ? link : 0) |
-                                (FreeItems.itemsAttachedToCursor() ? cursor : 0);
+                                (FreeItems.hasItemsAttachedToCursor() ? cursor : 0);
                 String status = "";
                 
@@ -264 +274 @@
                 }
                 
-                
                 MessageBay.setStatus(status);
         }