Changeset 4479

Timestamp:

2003-06-04T16:17:50+12:00 (21 years ago)

Author:

mdewsnip

Message:

Now remembers window location as well as size (storing in configuration file).

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -209 +209 @@
         }
 
-                // Size the screen
-        Dimension temp = config.getDimension("general.size", true);
-        if(temp != null) {
-        size = temp;
-        }
-        if (size.height > config.screen_size.height) {
-        size.setSize(size.width, config.screen_size.height);
-        }
-        if (size.width > config.screen_size.width) {
-        size.setSize(config.screen_size.width, size.height);
-        }
+        // Size and place the frame on the screen
+        Rectangle bounds = config.getBounds("general.bounds", true);
+        if (bounds != null) {
+        size = bounds.getSize();
+        }
+        // Ensure width and height are reasonable
+        if (size.width < 640) {
+        size.width = 640;
+        }
+        else if (size.width > config.screen_size.width) {
+        size.width = config.screen_size.width;
+        }
+        if (size.height < 480) {
+        size.height = 480;
+        }
+        else if (size.height > config.screen_size.height) {
+        size.height = config.screen_size.height;
+        }
                 // Set default font
         setUIFont(config.getFont("general.font", true), config.getFont("general.tooltip_font", true));
@@ -245 +252 @@
 
                 // Center the screen, if this is do-able (not under most linux window managers apparently. In fact you're lucky if they listen to any of your screen size requests).
-        g_man.setLocation((config.screen_size.width - size.width) / 2, (config.screen_size.height - size.height) / 2);
+        // g_man.setLocation((config.screen_size.width - size.width) / 2, (config.screen_size.height - size.height) / 2);
+        g_man.setBounds(bounds);
         g_man.setVisible(true);
                 // The 'after-display' triggers several events which don't occur until after the visual components are actually available on screen. Examples of these would be the various html renderings, as they can't happen offscreen.
@@ -304 +312 @@
         assoc_man = null;
     }
-    // Check the current size of the Gatherer, and if its reasonable (ie greater than minsize) then store it for next time.
-    Dimension size = g_man.getSize();
-    if(size.width > 100 && size.height > 100) {
-        config.setDimension("general.size", true, size);
-    }
+
+    // Store the current position and size (if reasonable) of the Gatherer for next time
+    Rectangle bounds = g_man.getBounds();
+    config.setBounds("general.bounds", true, bounds);
 
     // Save configuration.