Changeset 977

Timestamp:

12/08/15 11:22:31 (8 years ago)

Author:

bln4

Message:

Updates to how Next and LastItem magnetic constraint actions work; so as to deal with close items.

Location:

trunk/src/org/expeditee

Files:

• gui/DisplayIO.java (modified) (1 diff)
• gui/FrameKeyboardActions.java (modified) (1 diff)
• gui/FrameUtils.java (modified) (1 diff)
• items/Item.java (modified) (2 diffs)
• items/MagneticConstraint/Actions/LastItemAction.java (modified) (4 diffs)
• items/Tooltip.java (modified) (5 diffs)

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

@@ -177 +177 @@
                                 .getFloatMouseX(), FrameMouseActions.MouseY, isShiftDown,
                                 isCtrlDown);
-                                
-                if(isCtrlDown || DisplayIO.getFloatMouseX() + 1 >= newMouse.x && DisplayIO.getFloatMouseX() <= newMouse.x) {
+                                                
+                if(isCtrlDown 
+                                || (DisplayIO.getFloatMouseX() + 1 >= newMouse.x && DisplayIO.getFloatMouseX() <= newMouse.x)
+                                || (DisplayIO.getFloatMouseX() > newMouse.x && cursorMovement == Text.RIGHT)) {
                         if(cursorMovement == Text.RIGHT && !MagneticConstraints.getInstance().rightBorderHit(text)) {
                                 MagneticConstraints.getInstance().endOfLineHit(text);

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

@@ -249 +249 @@
 
         public synchronized void keyTyped(KeyEvent e) {
-
                 if (Simple.isProgramRunning()) {
                         if (e.isControlDown()

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

@@ -1198 +1198 @@
         if (possibles.size() == 1)
             return possibles.get(0);
-
+        
         // return closest x,y pair to mouse
         Item closest = possibles.get(0);

trunk/src/org/expeditee/items/Item.java

@@ -1157 +1157 @@
         public void setTooltips(final List<String> tooltips) {
                 if(tooltips == null || tooltips.size() == 0) _tooltip = new Tooltip();
-                else for(final String content: tooltips) _tooltip.addTooltip(content);
+                else for(final String content: tooltips) _tooltip.addTooltip(content, this);
         }
         
         public void setTooltip(final String tooltip) {
                 if(tooltip != null && tooltip.trim().length() > 0) {
-                        _tooltip.addTooltip(tooltip);
+                        _tooltip.addTooltip(tooltip, this);
                 }
         }
@@ -1170 +1170 @@
         }
         
-        public List<Text> getTooltipItems() {
+        public Collection<Text> getTooltipItems() {
                 return _tooltip.getTooltips();
         }

trunk/src/org/expeditee/items/MagneticConstraint/Actions/LastItemAction.java

@@ -2 +2 @@
 
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
@@ -17 +18 @@
                 final int idTop = item.getMagnetizedItemTop();
                 if(idLeft != -1) {
-                        moveCursor(item.getParent().getItemWithID(idLeft));
+                        moveCursor(item.getParent().getItemWithID(idLeft), item);
 //                      
 //                      System.err.println("#Current item " + FrameUtils.getCurrentItem());
@@ -27 +28 @@
                         return true;
                 } else if (idTop != -1) {
-                        moveCursor(item.getParent().getItemWithID(idTop));
+                        moveCursor(item.getParent().getItemWithID(idTop), item);
                         MagneticConstraints.Log(this.getClass(), new Item[]{item, item.getParent().getItemWithID(idTop)}, 
                                         Line.getLineContainingToken(item).toArray(new Item[]{}), 
@@ -35 +36 @@
         }
         
-        private boolean moveCursor(final Item toMoveTo) {
+        private boolean moveCursor(final Item toMoveTo, Item toMoveFrom) {
                 if(toMoveTo == null) return false;
                 if(toMoveTo instanceof Text) {
                         //System.err.println("Last item requests move to item with text: " + toMoveTo.getText());
 //                      final Text asText = (Text) toMoveTo;
-//                      final Point position = toMoveTo.getPosition();
+//                      final java.awt.Point position = toMoveTo.getPosition();
 //                      DisplayIO.setCursorPosition(position.x + asText.getPixelBoundsUnion().width, position.y, false);
 //                      FrameGraphics.refresh(false);
                         DisplayIO.setTextCursor((Text)toMoveTo, Text.END);
+                        if(FrameUtils.getCurrentItem() != toMoveTo) {
+                                Line.getLineFromToken(toMoveFrom).deltaX(1);
+                                moveCursor(toMoveTo, toMoveFrom);
+                        }
                 } else DisplayIO.setCursorPosition(toMoveTo.getPosition(), false);
                 return true;

trunk/src/org/expeditee/items/Tooltip.java

@@ -1 +1 @@
 package org.expeditee.items;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import org.expeditee.settings.templates.TemplateSettings;
@@ -7 +11 @@
 public class Tooltip {
         
-        private List<Text> tooltipItems = new LinkedList<Text>();
+        Tooltip() { }
         
-        public Text addTooltip(String content) {
+        private Map<Text, Item> tooltipItems = new HashMap<Text, Item>();
+        
+        public Text addTooltip(String content, final Item toItem) {
                 if(content.trim().toLowerCase().startsWith("text") && content.contains(":")) 
                         content = content.substring(content.indexOf(':') + 1);
-//              final Text tooltip = new Text(content);
                 final Text tooltip = TemplateSettings.TooltipTemplate.get().copy();
                 tooltip.setText(content);
-//              return addTooltip((Text) tooltip.getParentOrCurrentFrame().getTooltipTextItem(content));
-                return addTooltip(tooltip);
+                return addTooltip(tooltip, toItem);
         }
         
-        public Text addTooltip(final Text tooltip) {
-                tooltipItems.add(tooltip);
+        public Text addTooltip(final Text tooltip, final Item toItem) {
+                tooltipItems.put(tooltip, toItem);
                 return tooltip;
         }
         
-        public List<Text> getTooltips() { return tooltipItems; }
+        public Collection<Text> getTooltips() { return tooltipItems.keySet(); }
         
         public List<String> asStringList() { 
                 final List<String> ret = new LinkedList<String>();
-                for(final Text tooltip: tooltipItems) ret.add(tooltip.getText());
+                for(final Text tooltip: tooltipItems.keySet()) ret.add(tooltip.getText());
                 return ret;
         }
@@ -34 +38 @@
         public int getWidth() {
                 int max = 0;
-                for(final Text tooltip: tooltipItems) if(tooltip.getBoundsWidth() > max) max = tooltip.getBoundsWidth();
+                for(final Text tooltip: tooltipItems.keySet()) 
+                        if(tooltip.getBoundsWidth() > max) max = tooltip.getBoundsWidth();
                 return max;
         }
@@ -40 +45 @@
         public int getHeight() {
                 int max = 0;
-                for(final Text tooltip: tooltipItems) if(tooltip.getBoundsWidth() > max) max = tooltip.getBoundsHeight();
+                for(final Text tooltip: tooltipItems.keySet()) 
+                        if(tooltip.getBoundsWidth() > max) max = tooltip.getBoundsHeight();
                 return max;
         }
@@ -46 +52 @@
         public int getCollectiveHeight() {
                 int height = 0;
-                for(final Text tooltip: tooltipItems) height += tooltip.getBoundsHeight();
+                for(final Text tooltip: tooltipItems.keySet()) height += tooltip.getBoundsHeight();
                 return height;
         }