workaround for issue #15

lbalazscs · Sep 28, 2018 · 8bc7e13 · 8bc7e13
1 parent 3a43f2a
commit 8bc7e13
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/pixelitor/gui/utils/GUIUtils.java b/src/main/java/pixelitor/gui/utils/GUIUtils.java
@@ -34,6 +34,7 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -58,8 +59,7 @@ private GUIUtils() {
     }
 
     public static void centerOnScreen(Component component) {
-        Rectangle screen = GraphicsEnvironment.getLocalGraphicsEnvironment()
-                .getMaximumWindowBounds();
+        Dimension screen = getMaxWindowSize();
         Dimension window = component.getSize();
 
         if (window.height > screen.height) {
@@ -78,6 +78,23 @@ public static void centerOnScreen(Component component) {
         component.setSize(window);
     }
 
+    public static Dimension getMaxWindowSize() {
+        Rectangle bounds;
+        try {
+            // use this because it takes into account areas
+            // like the taskbar, but it can throw
+            // a "Window must not be zero" if there are 3 monitors
+            // on Linux with some newer Java versions, see
+            // https://github.com/lbalazscs/Pixelitor/issues/15
+            bounds = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                    .getMaximumWindowBounds();
+        } catch (Exception e) {
+            return Toolkit.getDefaultToolkit().getScreenSize();
+        }
+
+        return new Dimension(bounds.width, bounds.height);
+    }
+
     /**
      * @return true if any app window has focus
      */

diff --git a/src/main/java/pixelitor/utils/AppPreferences.java b/src/main/java/pixelitor/utils/AppPreferences.java
@@ -22,6 +22,7 @@
 import pixelitor.TipsOfTheDay;
 import pixelitor.gui.ImageArea;
 import pixelitor.gui.PixelitorWindow;
+import pixelitor.gui.utils.GUIUtils;
 import pixelitor.history.History;
 import pixelitor.io.Dirs;
 import pixelitor.layers.LayerButtonLayout;
@@ -35,9 +36,7 @@
 import javax.swing.filechooser.FileSystemView;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.GraphicsEnvironment;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.Window;
 import java.io.File;
 import java.util.prefs.Preferences;
@@ -129,8 +128,7 @@ public static void loadFramePosition(Window window) {
         int width = mainNode.getInt(FRAME_WIDTH_KEY, 0);
         int height = mainNode.getInt(FRAME_HEIGHT_KEY, 0);
 
-        Rectangle screen = GraphicsEnvironment.getLocalGraphicsEnvironment()
-                .getMaximumWindowBounds();
+        Dimension screen = GUIUtils.getMaxWindowSize();
 
         if ((width <= 0) || (height <= 0)) {
             width = screen.width;