From 432cad5ea8f73ac562d17d6b4ec85964478f08a4 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 24 Mar 2014 21:31:55 +0200 Subject: [PATCH] Creating layers with guiutil method --- src/com/annimon/turrets/Main.java | 2 +- src/com/annimon/turrets/MenuPanel.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/annimon/turrets/Main.java b/src/com/annimon/turrets/Main.java index 3e17ac8..d0af3d1 100644 --- a/src/com/annimon/turrets/Main.java +++ b/src/com/annimon/turrets/Main.java @@ -32,7 +32,7 @@ public class Main extends JFrame { setLocationByPlatform(true); setDefaultCloseOperation(EXIT_ON_CLOSE); - mainMenu = new JLayer<>(new MenuPanel(), new GuiUtil.PlanetBackground()); + mainMenu = GuiUtil.createPlanetLayer(new MenuPanel()); add(mainMenu); pack(); diff --git a/src/com/annimon/turrets/MenuPanel.java b/src/com/annimon/turrets/MenuPanel.java index f028bfa..4a582cd 100644 --- a/src/com/annimon/turrets/MenuPanel.java +++ b/src/com/annimon/turrets/MenuPanel.java @@ -1,6 +1,7 @@ package com.annimon.turrets; import static com.annimon.turrets.Constants.SCREEN_DIMENSION; +import com.annimon.turrets.util.GuiUtil; import com.annimon.turrets.util.Prefs; import java.awt.BorderLayout; import java.awt.Color; @@ -84,6 +85,10 @@ public class MenuPanel extends JPanel { Main.getInstance().switchLayout(canvas); new Thread(canvas).start(); break; + case 2: // Options + Main.getInstance().switchLayout( + GuiUtil.createPlanetLayer(new OptionsPanel())); + break; case 4: System.exit(0); break;