Changeset 924

Timestamp:

10/02/14 18:27:27 (10 years ago)

Author:

jts21

Message:

Fix for titles on new frames getting set to the minimum font-size when the template's title is centred

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (4 diffs)

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

@@ -48 +48 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
+import org.expeditee.items.Justification;
 import org.expeditee.items.PermissionPair;
 import org.expeditee.items.Text;
@@ -698 +699 @@
                 }
 
-                // do auto shrinking of the title IF not in twin frames mode
+                // do auto shrinking of the title IF not in twin frames mode and the title is not centred
                 Item titleItem = template.getTitleItem();
 
-                if (!DisplayIO.isTwinFramesOn()) {
+                if (!DisplayIO.isTwinFramesOn() && !Justification.center.equals(((Text)titleItem).getJustification())) {
                         if ((titleItem.getX() + 1) < template.getNameItem().getX()) {
                                 while (titleItem.getSize() > Text.MINIMUM_FONT_SIZE
@@ -707 +708 @@
                                                                 .getNameItem().getX()) {
                                         titleItem.setSize(titleItem.getSize() - 1);
-
                                 }
                         } else {
@@ -713 +713 @@
                         }
                 }
-
                 // Assign a width to the title.
                 titleItem.setRightMargin(template.getNameItem().getX(), true);