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

Timestamp:

03/18/19 18:38:32 (5 years ago)

Author:

davidb

Message:

Changed how DisplayController width, height and size are retrieved. Now does this top-level, rather than going through the AxisAlignmentBox. In doing so, can now control for when the window size has you yet been correctly mapped to the screen, and fall back to pre-defined MINIMUM defaults

File:

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

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

@@ -387 +387 @@
                 if (width == null) {
                         setJustification(Justification.left);
-                        setRightMargin(DisplayController.getFramePaintArea().getWidth(), false);
+                        setRightMargin(DisplayController.getFramePaintAreaWidth(), false);
                         return;
                 }
@@ -402 +402 @@
                 if (width == null) {
                         setJustification(Justification.left);
-                        setRightMargin(DisplayController.getFramePaintArea().getWidth(), false);
+                        setRightMargin(DisplayController.getFramePaintAreaWidth(), false);
                         return;
                 }
@@ -1801 +1801 @@
                 if (limitWidth) {
                         if (_maxWidth == null) {
-                                width = DisplayController.getFramePaintArea().getWidth() - getX();
+                                width = DisplayController.getFramePaintAreaWidth() - getX();
                         } else {
                                 width = getAbsoluteWidth();
@@ -2282 +2282 @@
                         int model_frame_name_x = modelFrame.getNameItem().getX();
                         if (model_frame_name_x < DisplayController.MINIMUM_FRAME_WIDTH) {
-                                System.err.println("Text::resetTitlePostion(): value to be used as right margin from position of frameName < 512");
+                                System.err.println("**** Text::resetTitlePostion(): value to be used as right margin from position of frameName < 512");
                                 System.err.println("  Overriding to ensure reasonable width for title"); 
                                 model_frame_name_x = DisplayController.MINIMUM_FRAME_WIDTH;
@@ -2395 +2395 @@
         private void clipFrameMargin() {
                 if (!hasFixedWidth()) {
-                        int frameWidth = DisplayController.getFramePaintArea().getWidth();
+                        int frameWidth = DisplayController.getFramePaintAreaWidth();
                         /*
                          * Only change width if it is more than 150 pixels from the right of the screen
@@ -2417 +2417 @@
                 }
 
-                Integer width = DisplayController.getFramePaintArea().getWidth();
+                Integer width = DisplayController.getFramePaintAreaWidth();
 
                 // Check if that text item is inside an enclosing rectangle...
@@ -2457 +2457 @@
 
         public void resetFrameNamePosition() {
-                Dimension maxSize = DisplayController.getSizeEnforceMinimum();
-                                
+                //Dimension maxSize = DisplayController.getSizeEnforceMinimum();
+                Dimension maxSize = DisplayController.getFramePaintAreaSize();
+                
                 if (maxSize != null) {
                         // setMaxWidth(maxSize.width);
@@ -2717 +2718 @@
                         // Subtract off the link width
                         if (anchor != null) {
-                                setX(DisplayController.getFramePaintArea().getWidth() - anchor - getBoundsWidth() + getLeftMargin());
+                                setX(DisplayController.getFramePaintAreaWidth() - anchor - getBoundsWidth() + getLeftMargin());
                         }
                         return;
@@ -2728 +2729 @@
                 int oldX = getX();
                 if (anchor != null) {
-                        float deltaX = DisplayController.getFramePaintArea().getWidth() - anchor - getBoundsWidth()
+                        float deltaX = DisplayController.getFramePaintAreaWidth() - anchor - getBoundsWidth()
                                         + getLeftMargin() - oldX;
                         anchorConnected(AnchorEdgeType.Right, deltaX);
@@ -2778 +2779 @@
                                         final float ascent = getTextLayouts().get(0).getAscent();
                                         final float descent = getTextLayouts().get(0).getDescent();
-                                        setY(DisplayController.getFramePaintArea().getHeight()
+                                        setY(DisplayController.getFramePaintAreaHeight()
                                                         - (anchor + this.getBoundsHeight() - ascent - descent));
                                 } else if (this.getFont() != null) {
@@ -2785 +2786 @@
                                         final float ascent = fakeLayout.getAscent();
                                         final float descent = fakeLayout.getDescent();
-                                        setY(DisplayController.getFramePaintArea().getHeight()
+                                        setY(DisplayController.getFramePaintAreaHeight()
                                                         - (anchor + this.getBoundsHeight() - ascent - descent));
                                 }
@@ -2800 +2801 @@
                 if (anchor != null) {
 
-                        float deltaY = DisplayController.getFramePaintArea().getHeight() - anchor - oldY;
+                        float deltaY = DisplayController.getFramePaintAreaHeight() - anchor - oldY;
                         anchorConnected(AnchorEdgeType.Bottom, deltaY);
                 }