Fullscreen now working

CubeControl/Frame.java

@@ -77,6 +77,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 	private JButton frameDuration = new JButton();
     private JButton fullScreenButton = new JButton();
 	private JButton playAnimation = new JButton();
+	private JButton exitButton;
 	// Ende Attribute
 
 	public cubeWorker worker = new cubeWorker();
@@ -369,6 +370,16 @@ public class Frame extends JFrame implements ListSelectionListener {
 			}
 		});
 
+		exitButton = new JButton("Exit Fullscreen");
+		exitButton.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-300, Toolkit.getDefaultToolkit().getScreenSize().height-80, 150, 25);
+		cp.add(exitButton);
+		exitButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				exitFullscreen();
+			}
+		});
+
+
 		playAnimation.setText("Play");
 		playAnimation.setBounds(344, 390, 147, 25);
 		playAnimation.setFont(new Font("Dialog", Font.PLAIN, 13));
@@ -576,9 +587,30 @@ public class Frame extends JFrame implements ListSelectionListener {
 	
 	public void enterFullscreen(ActionEvent evt) {
 		ledView.enterFullscreen();
-		FullscreenWindow fw = new FullscreenWindow(worker, cubeCanvas, ledView, this);
+		//FullscreenWindow fw = new FullscreenWindow(worker, cubeCanvas, ledView, this);
+		setLocation(0,0);
+		setSize(700, 700);
+		int w = Toolkit.getDefaultToolkit().getScreenSize().width;
+		int h = Toolkit.getDefaultToolkit().getScreenSize().height;
+		System.out.println(w);
+		System.out.println(h);
+		setSize(w-5, h-30);
+		//setSize(Toolkit.getDefaultToolkit().getScreenSize().width, Toolkit.getDefaultToolkit().getScreenSize().height);
+		//Y U NO WORK????
+		cubeCanvas.setBounds(0,0,Toolkit.getDefaultToolkit().getScreenSize().width-5, Toolkit.getDefaultToolkit().getScreenSize().height-80);
 	
 	}
+	public void exitFullscreen(){
+	//661, 440
+	setLocation(0,0);
+		setSize(661, 440);
+		ledView.leaveFullscreen();
+		cubeCanvas.setBounds(8,8, 250,250);
+		Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+		int x = (d.width - getSize().width) / 2;
+		int y = (d.height - getSize().height) / 2;
+		setLocation(x, y);
+	}
 	
 	public void editA_ActionPerformed(ActionEvent evt) {
 

CubeControl/FullscreenWindow.java

@@ -1,86 +0,0 @@
-/*
- * FullscreenWindow.java
- *
- *
- * Copyright 2011 Thomas Buck <xythobuz@me.com>
- * Copyright 2011 Max Nuding <max.nuding@gmail.com>
- * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
- *
- * This file is part of LED-Cube.
- *
- * LED-Cube is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LED-Cube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LED-Cube. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * This class is responsible for displaying the 3D View of our Cube in fullscreen mode.
- * 
- * @author Thomas Buck
- * @author Max Nuding
- * @author Felix Bäder
- * @version 1.0
- */
-
-
-import com.sun.j3d.utils.universe.*;
-import javax.media.j3d.*;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.io.File;
-
-public class FullscreenWindow extends JFrame {
-	private Container cp = getContentPane();
-	private cubeWorker worker;
-	private JButton exitButton;
-	private Canvas3D canvas;
-	private Led3D led;
-	private int width;
-	private int height;
-	private Frame frame;
-	
-	public FullscreenWindow (cubeWorker cw, Canvas3D cv, Led3D ledview, Frame f) {
-		//Basic layout stuff
-		this.setUndecorated(true);
-		Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-		setSize(d);
-		setLocation(0,0);
-		cp.setLayout(null);
-		setResizable(false);
-		
-		worker = cw;
-		width = d.width;
-		height = d.height;
-		canvas = cv;
-		led = ledview;
-		frame = f;
-		exitButton = new JButton("Exit Fullscreen");
-		exitButton.setBounds(width-150, height-25, 150, 25);
-		exitButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent evt) {
-				dispose();
-				frame.ledView.leaveFullscreen();
-			}
-		});
-		
-		canvas.setBounds(0,0, width, height-30);
-
-		
-		cp.add(exitButton);
-		cp.add(canvas);
-		
-		setVisible(true);
-	}
-
-}

CubeControl/makefile

@@ -16,7 +16,7 @@ endif
 
 # All java files to be compiled
 # List so it works as target
-JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java FullscreenWindow.java
+JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java
 
 # --------------------------------------