Changeset 107 for trunk/src/org/expeditee/actions/Simple.java

Timestamp:

06/20/08 16:48:33 (16 years ago)

Author:

ra33

Message:

Fixed rounding errors in Text class...
They caused a whole bunch of problems with small fonts and text items with several lines!

File:

• trunk/src/org/expeditee/actions/Simple.java (modified) (2 diffs)

trunk/src/org/expeditee/actions/Simple.java

@@ -1133 +1133 @@
                                                 context.getPrimitives().setValue(tokens[2],
                                                                 new SString(currentFrame.getName()));
+                                        }
+                                } else if (tokens[0].equals("getcurrentitem")) {
+                                        assertMinParametreCount(tokens, 1);
+                                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+
+                                        Item currentItem = FrameUtils.getCurrentItem();
+
+                                        context.getPointers().setObject(tokens[1], currentItem);
+
+                                        // check if the user is also after line position
+                                        if (currentItem != null && currentItem instanceof Text
+                                                        && tokens.length > 2) {
+                                                Text text = (Text) currentItem;
+                                                int cursorLinePos = text
+                                                                .getLinePosition(FrameMouseActions.getY());
+                                                context.getPrimitives().setValue(tokens[2],
+                                                                new SInteger(cursorLinePos + 1));
+                                                if (tokens.length > 3) {
+                                                        int cursorCharPos = text.getCharPosition(
+                                                                        cursorLinePos, DisplayIO.getMouseX())
+                                                                        .getCharIndex();
+                                                        context.getPrimitives().setValue(tokens[3],
+                                                                        new SInteger(cursorCharPos + 1));
+                                                }
                                         }
                                 }
@@ -1724 +1748 @@
                         boolean success = fileContents != null;
                         if (!success)
-                                FrameGraphics.WarningMessage("Error copying " + frameToCopy.getName());
+                                FrameGraphics.WarningMessage("Error copying "
+                                                + frameToCopy.getName());
                         FrameIO.ResumeCache();
                         if (tokens.length > 4) {