diff --git a/forge-gui-desktop/src/main/java/forge/control/FControl.java b/forge-gui-desktop/src/main/java/forge/control/FControl.java index e4f78df52e2..46173a0905d 100644 --- a/forge-gui-desktop/src/main/java/forge/control/FControl.java +++ b/forge-gui-desktop/src/main/java/forge/control/FControl.java @@ -442,6 +442,7 @@ public enum FControl implements KeyEventDispatcher { match.startGame(newGame); } }); + SOverlayUtils.hideOverlay(); } public final void endCurrentGame() { @@ -587,7 +588,6 @@ public enum FControl implements KeyEventDispatcher { @Override public void run() { startGameWithUi(mc); - SOverlayUtils.hideOverlay(); } }); } diff --git a/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java b/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java index a6335db3219..d2f52102305 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java +++ b/forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java @@ -35,18 +35,21 @@ public final class SOverlayUtils { final int h = overlay.getHeight(); final int pnlW = 400; final int pnlH = 300; + final int labelHeight = 50; + final int logoSize = pnlH - labelHeight; // Adds the "loading" panel to generic overlay container // (which is preset with null layout and close button) final FPanel pnl = new FPanel(); pnl.setLayout(new MigLayout("insets 0, gap 0, ax center, wrap")); - pnl.setBackground(FSkin.getColor(FSkin.Colors.CLR_ACTIVE)); + pnl.setBackground(FSkin.getColor(FSkin.Colors.CLR_ACTIVE).alphaColor(191)); pnl.setBounds(new Rectangle(((w - pnlW) / 2), ((h - pnlH) / 2), pnlW, pnlH)); - pnl.add(new FLabel.Builder().icon(FSkin.getIcon(FSkinProp.ICO_LOGO)).build(), - "h 200px!, align center"); + pnl.add(new FLabel.Builder().icon(FSkin.getIcon(FSkinProp.ICO_LOGO)) + .iconScaleFactor(1d).iconInBackground().build(), + "w " + logoSize + "px!, h " + logoSize + "px!, align center"); pnl.add(new FLabel.Builder().text("Loading new game...") - .fontSize(22).build(), "h 40px!, align center"); + .fontSize(22).build(), "h " + labelHeight + "px!, align center"); overlay.add(pnl); } diff --git a/forge-gui/CHANGES.txt b/forge-gui/CHANGES.txt index 43fdf73cceb..b4e06377c3c 100644 --- a/forge-gui/CHANGES.txt +++ b/forge-gui/CHANGES.txt @@ -22,6 +22,9 @@ Support renaming gauntlets. Support sorting gauntlets (and quests) case insensitive. +- Fixed loading overlay to show logo properly and have some transparency - + + --------- New Cards ---------