Changeset 1258 for trunk/src/org/apollo

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/apollo/gui

Files:

• ExpandedTrackManager.java (modified) (2 diffs)
• FrameLayoutDaemon.java (modified) (3 diffs)

trunk/src/org/apollo/gui/ExpandedTrackManager.java

@@ -170 +170 @@
                                 if (!PopupManager.getInstance().isShowing(trackSelectionPopup)) {
                                         
-                                        trackSelectionPopup.setLocation((DisplayController.getFramePaintArea().getWidth() - trackSelectionPopup.getFullBounds().getWidth()) / 2, 0);
+                                        trackSelectionPopup.setLocation((DisplayController.getFramePaintAreaWidth() - trackSelectionPopup.getFullBounds().getWidth()) / 2, 0);
                                         
                                         // Creep from above
@@ -413 +413 @@
                         assert(Browser._theBrowser != null);
                 
-                        int cpWidth = DisplayController.getFramePaintArea().getWidth();
-                        int cpHeight = DisplayController.getFramePaintArea().getHeight();
+                        int cpWidth = DisplayController.getFramePaintAreaWidth();
+                        int cpHeight = DisplayController.getFramePaintAreaHeight();
                         if (!DisplayController.isAudienceMode()) { // if message bay is showing - the remove the height
                                 

trunk/src/org/apollo/gui/FrameLayoutDaemon.java

@@ -423 +423 @@
                                         // Ensure that left most pixel is at a reasonable position
                                         if (!supressSpatialLayout && (initiationXPixel < 0 ||
-                                                        (initiationXPixel > DisplayController.getFramePaintArea().getWidth() && DisplayController.getFramePaintArea().getWidth() > leftMargin))) {
+                                                        (initiationXPixel > DisplayController.getFramePaintAreaWidth() && DisplayController.getFramePaintAreaWidth() > leftMargin))) {
                                                 initiationXPixel = leftMargin;
                                         } else if (!supressSpatialLayout && initiationXPixel > LAYOUT_MAX_INITIATION_PIXEL) {
@@ -432 +432 @@
                                                 timelineWidth = rightMostPixel - initiationXPixel;
                                         } else {
-                                                timelineWidth = DisplayController.getFramePaintArea().getWidth() - initiationXPixel - rightMargin;
+                                                timelineWidth = DisplayController.getFramePaintAreaWidth() - initiationXPixel - rightMargin;
                                         }
                                         
@@ -546 +546 @@
                                         if (width > 0) {
                                                 
-                                                if (width > (DisplayController.getFramePaintArea().getWidth() - (2 * FREE_SPACE_MARGINS))) {
-                                                        width = DisplayController.getFramePaintArea().getWidth() - (2 * FREE_SPACE_MARGINS);
+                                                if (width > (DisplayController.getFramePaintAreaWidth() - (2 * FREE_SPACE_MARGINS))) {
+                                                        width = DisplayController.getFramePaintAreaWidth() - (2 * FREE_SPACE_MARGINS);
                                                 }