From c1e1b6f29aeb5122279c92ebd4f7a2c5d6817232 Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Sat, 27 Jan 2018 09:48:19 -0700 Subject: [PATCH] Improve deck view with multi-monitor systems On Linux multi-monitor systems, the existing logic would create a new window that was slightly smaller than the total combined display size. The new logic creates a window that is slightly smaller than the monitor Forge is currently on. Signed-off-by: Jamin W. Collins --- .../src/main/java/forge/deckchooser/FDeckViewer.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java index 6d337754932..6b5a97dedaa 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java @@ -1,5 +1,6 @@ package forge.deckchooser; +import com.sun.prism.Graphics; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; @@ -123,10 +124,12 @@ public class FDeckViewer extends FDialog { if(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_SMALL_DECK_VIEWER)){ width = 800; height = 600; - }else{ - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - width = (int)(screenSize.width * 0.8); - height = (int)(screenSize.height * 0.9); + } + else { + GraphicsDevice gd = this.getGraphicsConfiguration().getDevice(); + + width = (int)(gd.getDisplayMode().getWidth() * 0.8); + height = (int)(gd.getDisplayMode().getHeight() * 0.9); } this.setPreferredSize(new Dimension(width, height));