Changeset 699

Timestamp:

01/15/14 17:54:12 (10 years ago)

Author:

jts21

Message:

Attempt at fixing problem with window height not being known at settings frame generation

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (3 diffs)
• FrameGraphics.java (modified) (1 diff)

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

@@ -160 +160 @@
 
         private Browser() {
-                // Use the default values initially so we can load the profile frame
-                setSizes(new Dimension(UserSettings.InitialWidth.get(),
-                                UserSettings.InitialHeight.get()));
                 // center the frame on the screen
                 Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
@@ -192 +189 @@
         }
             
+            setSizes(new Dimension(UserSettings.InitialWidth.get(), UserSettings.InitialHeight.get()));
+            
+            // set the layout to absolute layout for widgets
+                this.getContentPane().setLayout(new AbsoluteLayout());
+
+                _mouseEventRouter = new MouseEventRouter(getJMenuBar(),
+                                getContentPane());
+
+                // enable the glasspane-for capturing all mouse events
+                this.setGlassPane(_mouseEventRouter);
+
+                this.getGlassPane().setVisible(true);
+                this.getContentPane().setBackground(Color.white);
+                this.getContentPane().setFocusTraversalKeysEnabled(false);
+
+                addComponentListener(this);
+                pack();
+
+                // Reset windows to user specified size
+                // Must be done after initialising the content pane above!
+                setSizes(new Dimension(UserSettings.InitialWidth.get(), UserSettings.InitialHeight.get()));
+            
                 // UserSettings.ProfileName.set(FrameIO.ConvertToValidFramesetName(System.getProperty("user.name")));
                 String userName = UserSettings.ProfileName.get();
@@ -216 +235 @@
                         FreeItems.setCursor(cursor);
                 }
-                
-                // set the layout to absolute layout for widgets
-                this.getContentPane().setLayout(new AbsoluteLayout());
-
-                _mouseEventRouter = new MouseEventRouter(getJMenuBar(),
-                                getContentPane());
-
-                // enable the glasspane-for capturing all mouse events
-                this.setGlassPane(_mouseEventRouter);
-
-                this.getGlassPane().setVisible(true);
-                this.getContentPane().setBackground(Color.white);
-                this.getContentPane().setFocusTraversalKeysEnabled(false);
-
-                addComponentListener(this);
-                pack();
-
-                // Reset windows to user specified size
-                // Must be done after initialising the content pane above!
-                setSizes(new Dimension(UserSettings.InitialWidth.get(),
-                                UserSettings.InitialHeight.get()));
 
                 /*

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

@@ -39 +39 @@
 
         // the maximum size that can be used to paint on
-        private static Dimension _MaxSize = new Dimension(UserSettings.InitialWidth.get(), UserSettings.InitialHeight.get() - MessageBay.MESSAGE_BUFFER_HEIGHT);
+        private static Dimension _MaxSize = null;
 
         // Final passes to renderering the current frame