Changeset 1392

Timestamp:

05/28/19 15:36:50 (5 years ago)

Author:

bln4

Message:

Obey the minimum font size when having to deal with _singleLine=true on a text item. In this case, ignore the width rather than the _singleLine.

File:

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

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

@@ -1835 +1835 @@
                                 
                                 while(proposedTextLayout.size() > 1) {
-                                        paintFont.setSize(paintFont.getSize() - 1);
+                                        paintFont.setSize(Math.max(paintFont.getSize() - 1, MINIMUM_FONT_SIZE));
                                         proposedTextLayout = 
                                                 EcosystemManager.getTextLayoutManager().layoutString(
@@ -1841 +1841 @@
                                                         paintFont,
                                                         new Point(getX(), getY()), lines != null ? lines.toArray(new org.expeditee.core.Line[1]) : null,
-                                                        (int) width, 
+                                                        paintFont.getSize() > MINIMUM_FONT_SIZE ? (int) width : (int) Float.MAX_VALUE, 
                                                         (int) getSpacing(), 
                                                         true,