- Timestamp:
- 01/08/14 15:37:44 (10 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/FrameCreator.java
r669 r670 9 9 public class FrameCreator { 10 10 public static final int INDENT_FROM_TITLE = 20; 11 12 // offset between items13 private int y_offset = 2;14 11 15 12 private int START_Y; … … 199 196 } 200 197 201 toAdd.setPosition(_lastX, _lastY );198 toAdd.setPosition(_lastX, _lastY + toAdd.getBoundsHeight() / 2); 202 199 toAdd.setOffset(0, 0); 203 200 toAdd.setID(_current.getNextItemID()); … … 209 206 save(); 210 207 211 _lastY = toAdd.getY() + toAdd.getBoundsHeight() + y_offset;208 _lastY = toAdd.getY() + toAdd.getBoundsHeight() / 2; 212 209 _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX); 213 210 -
trunk/src/org/expeditee/gui/FrameUtils.java
r658 r670 590 590 DisplayIO.setCursor(Item.DEFAULT_CURSOR); 591 591 592 UserSettings.TitleTemplate.setDefault(profile.getTitleItem()); 592 593 UserSettings.TitleTemplate.set(profile.getTitleItem()); 593 594 … … 1360 1361 title.setColor(Color.BLUE); 1361 1362 title.setPosition(25, 50); 1362 1363 int spacing = 50; 1363 1364 UserSettings.TitleTemplate.setDefault(title); 1365 UserSettings.TitleTemplate.set(title); 1366 1367 // int spacing = 50; 1364 1368 final int intialYPos = 75; 1365 1369 int xPos = 75; -
trunk/src/org/expeditee/settings/Settings.java
r669 r670 205 205 } else if(s instanceof GenericSetting && ((GenericSetting) s).getType().equals(Text.class)) { 206 206 t = ((GenericSetting<Text>) s).get(); 207 if(t == null) continue; 207 if(t == null) { 208 System.err.println("Failed to get Text setting \"" + str + "\""); 209 continue; 210 } 208 211 t = t.copy(); 209 212 t.setID(frames.getCurrentFrame().getNextItemID());
Note:
See TracChangeset
for help on using the changeset viewer.