Changeset 659 for trunk/src/org/expeditee/items/Text.java

Timestamp:

01/07/14 15:26:22 (10 years ago)

Author:

ngw8

Message:

Improvements WebParser conversions of wrapped text - links and other formatting now maintained. Fixed inability to have negative letter spacing, doesn't seem to have broken anything. Changed text line spacing to be a float.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (6 diffs)

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

@@ -39 +39 @@
 import org.expeditee.gui.FreeItems;
 import org.expeditee.math.ExpediteeJEP;
+import org.expeditee.settings.UserSettings;
 import org.expeditee.settings.experimental.ExperimentalFeatures;
 import org.nfunk.jep.Node;
@@ -112 +113 @@
         private Justification _justification = Justification.left;
 
-        private int _spacing = -1;
+        private float _spacing = -1;
 
         private int _word_spacing = -1;
 
-        private int _initial_spacing = -1;
-
-        private int _letter_spacing = -1;
+        private float _initial_spacing = 0;
+
+        private float _letter_spacing = 0;
 
         // used during ranging out
@@ -1192 +1193 @@
          *            The number of pixels to allow between each line
          */
-        public void setSpacing(int spacing) {
+        public void setSpacing(float spacing) {
                 _spacing = spacing;
                 updatePolygon();
@@ -1202 +1203 @@
          * @return The spacing (inter-line) in pixels of this Text.
          */
-        public int getSpacing() {
+        public float getSpacing() {
                 return _spacing;
         }
@@ -1228 +1229 @@
          *            Additional spacing to add between letters. See {@link java.awt.font.TextAttribute#TRACKING}
          */
-        public void setLetterSpacing(int spacing) {
+        public void setLetterSpacing(float spacing) {
                 _letter_spacing = spacing;
                 HashMap<TextAttribute, Object> attr = new HashMap<TextAttribute, Object>();
                 attr.put(TextAttribute.TRACKING, spacing);
-                this._font = this._font.deriveFont(attr);
+                
+                if (this._font == null) {
+                        this._font = Font.decode(DEFAULT_FONT);
+                }
+
+                this.setFont(this._font.deriveFont(attr));
         }
 
@@ -1238 +1244 @@
          * @return The spacing (proportional to the font size) between letters. See {@link java.awt.font.TextAttribute#TRACKING}
          */
-        public int getLetterSpacing() {
+        public float getLetterSpacing() {
                 return _letter_spacing;
         }
 
-        public void setInitialSpacing(int spacing) {
+        public void setInitialSpacing(float spacing) {
                 _initial_spacing = spacing;
         }
 
-        public int getInitialSpacing() {
+        public float getInitialSpacing() {
                 return _initial_spacing;
         }