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

Timestamp:

12/17/13 15:52:27 (11 years ago)

Author:

jts21

Message:

Add panning action

• Use by shift-left-click and dragging the mouse, or by adding a "Pan" action
• Mouse binding is disabled by default, enable via "MousePan" setting in in settings/experimental (also "AutoWrap" setting was moved to experimental too)
• Frames now save all visible items instead of deleting items that have negative position values, this change was made so items would not be lost by panning the frame.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (5 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;
 
@@ -1434 +1434 @@
                 List<Point[]> lines = null;
                 
-                if(_autoWrap || UserSettings.AutoWrap) {
+                if(_autoWrap || ExperimentalFeatures.AutoWrap) {
                 lines = new LinkedList<Point[]>();
                 if(DisplayIO.getCurrentFrame() == null) {
@@ -1500 +1500 @@
                         _textLayouts.add(layout);
                                                 
-                        if(_autoWrap || UserSettings.AutoWrap) {
+                        if(_autoWrap || ExperimentalFeatures.AutoWrap) {
                                 
                         if(lineHeight != Float.NaN) {
@@ -1645 +1645 @@
                         return;
                 
-                if(_autoWrap || UserSettings.AutoWrap) {
+                if(_autoWrap || ExperimentalFeatures.AutoWrap) {
                         invalidateAll();
                 
@@ -2114 +2114 @@
                 
                 // if autowrap is on, wrapping is done every time we draw
-                if(UserSettings.AutoWrap) {
+                if(ExperimentalFeatures.AutoWrap) {
                         return;
                 }