Changeset 1258 for trunk/src/org/expeditee/gui

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

Location:

trunk/src/org/expeditee/gui

Files:

• DisplayController.java (modified) (4 diffs)
• FrameCreator.java (modified) (2 diffs)
• MessageBay.java (modified) (2 diffs)

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

@@ -73 +73 @@
         public static final int MINIMUM_FRAME_HEIGHT = 512;
         
-        private static boolean DISPLAYED_ABOVE_MINIMUM_FRAME_WIDTH = false;
+        public static boolean DISPLAYED_ABOVE_MINIMUM_FRAME_WIDTH = false;
         
         /** Convenience definition of TwinFramesSide.LEFT. */
@@ -1245 +1245 @@
         }
         
-        public static Dimension getSizeEnforceMinimum() {
-                Dimension actual_dim = getFramePaintArea().getSize(); 
+        public static Dimension getSizeEnforceMinimumXXXX() { // **** DB
+                Dimension actual_dim = getFramePaintAreaSize(); 
                 
                 int enforced_width  = Math.max(actual_dim.width, MINIMUM_FRAME_WIDTH);
@@ -1305 +1305 @@
         }
         
+        public static int getFramePaintAreaWidth()
+        {
+                if (!DISPLAYED_ABOVE_MINIMUM_FRAME_WIDTH) {
+                        return  MINIMUM_FRAME_WIDTH;
+                }
+                
+                return _framePaintArea.getWidth();
+        }
+        
+        public static int getFramePaintAreaHeight()
+        {
+                if (!DISPLAYED_ABOVE_MINIMUM_FRAME_WIDTH) {
+                        return  MINIMUM_FRAME_HEIGHT;
+                }
+                
+                return _framePaintArea.getHeight();
+        }
+        
+        public static Dimension getFramePaintAreaSize()
+        {
+                if (!DISPLAYED_ABOVE_MINIMUM_FRAME_WIDTH) {
+                        Dimension min_dim = new Dimension(MINIMUM_FRAME_WIDTH,MINIMUM_FRAME_HEIGHT);
+                        return min_dim;
+                }
+                
+                return _framePaintArea.getSize();
+        }
+                
         public static AxisAlignedBoxBounds getMessageBayPaintArea()
         {
@@ -1407 +1435 @@
                         Image image = null;
                         if (currentFrame != null && (!useInvalidation || !frameClip.isFullyClipped())) {
-                                image = FrameGraphics.getFrameImage(currentFrame, frameClip, getFramePaintArea().getSize());
+                                image = FrameGraphics.getFrameImage(currentFrame, frameClip, getFramePaintAreaSize());
                         }
 

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

@@ -220 +220 @@
                                 // new frame
                                 if (!_multiColumn
-                                                || toAdd.getBoundsWidth() + _lastX > DisplayController.getFramePaintArea().getWidth()) {
+                                                || toAdd.getBoundsWidth() + _lastX > DisplayController.getFramePaintAreaWidth()) {
                                         // Make sure text items that are created on the current
                                         // frame are removed
@@ -231 +231 @@
                         toAdd.setOffset(0, 0);
                         toAdd.setID(_current.getNextItemID());
-                        toAdd.setRightMargin(DisplayController.getFramePaintArea().getWidth(), true);
+                        toAdd.setRightMargin(DisplayController.getFramePaintAreaWidth(), true);
 
                         _current.addItem(toAdd);

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

@@ -133 +133 @@
         private static void updateLink() {
                 if (!isLinkInitialized && DisplayController.getFramePaintArea() != null
-                                && DisplayController.getFramePaintArea().getWidth() > 0) {
+                                && DisplayController.getFramePaintAreaWidth() > 0) {
                         // set up 'Messages' link on the right hand side
                         _messageLink.setPosition(DisplayController.getMessageBayPaintArea().getWidth() - MESSAGE_LINK_Y_OFFSET,
@@ -218 +218 @@
                 Text t = new Text(getMessagePrefix(true) + message);
                 t.setPosition(20, 15 + _messages.size() * 25);
-                t.setOffset(0, -DisplayController.getFramePaintArea().getHeight());
+                t.setOffset(0, -DisplayController.getFramePaintAreaHeight());
                 t.setColor(color);
                 t.setLink(link);