Changeset 670

Timestamp:

01/08/14 15:37:44 (10 years ago)

Author:

jts21

Message:

Make sure TitleTemplate is set before generateSettingsTree() is called, and change FrameCreator so item placement is better (items no longer overlap).

Location:

trunk/src/org/expeditee

Files:

• gui/FrameCreator.java (modified) (3 diffs)
• gui/FrameUtils.java (modified) (2 diffs)
• settings/Settings.java (modified) (1 diff)

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

@@ -9 +9 @@
 public class FrameCreator {
         public static final int INDENT_FROM_TITLE = 20;
-        
-        // offset between items
-        private int y_offset = 2;
 
         private int START_Y;
@@ -199 +196 @@
                         }
 
-                        toAdd.setPosition(_lastX, _lastY);
+                        toAdd.setPosition(_lastX, _lastY + toAdd.getBoundsHeight() / 2);
                         toAdd.setOffset(0, 0);
                         toAdd.setID(_current.getNextItemID());
@@ -209 +206 @@
                                 save();
 
-                        _lastY = toAdd.getY() + toAdd.getBoundsHeight() + y_offset;
+                        _lastY = toAdd.getY() + toAdd.getBoundsHeight() / 2;
                         _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX);
 

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

@@ -590 +590 @@
                 DisplayIO.setCursor(Item.DEFAULT_CURSOR);
 
+                UserSettings.TitleTemplate.setDefault(profile.getTitleItem());
                 UserSettings.TitleTemplate.set(profile.getTitleItem());
 
@@ -1360 +1361 @@
                 title.setColor(Color.BLUE);
                 title.setPosition(25, 50);
-
-                int spacing = 50;
+                
+                UserSettings.TitleTemplate.setDefault(title);
+                UserSettings.TitleTemplate.set(title);
+
+                // int spacing = 50;
                 final int intialYPos = 75;
                 int xPos = 75;

trunk/src/org/expeditee/settings/Settings.java

@@ -205 +205 @@
                                 } else if(s instanceof GenericSetting && ((GenericSetting) s).getType().equals(Text.class)) {
                                         t = ((GenericSetting<Text>) s).get();
-                                        if(t == null) continue;
+                                        if(t == null) {
+                                                System.err.println("Failed to get Text setting \"" + str + "\"");
+                                                continue;
+                                        }
                                         t = t.copy();
                                         t.setID(frames.getCurrentFrame().getNextItemID());