Browse Source

Prettier fullscreen and nicer default-view in fullscreenmode (now all LEDs are displayed)

Max Nuding 12 years ago
parent
commit
627387d131
2 changed files with 8 additions and 8 deletions
  1. 6
    6
      CubeControl/Frame.java
  2. 2
    2
      CubeControl/Led3D.java

+ 6
- 6
CubeControl/Frame.java View File

@@ -598,15 +598,15 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
598 598
 				setSize(700, 700);
599 599
 				int w = Toolkit.getDefaultToolkit().getScreenSize().width;
600 600
 				int h = Toolkit.getDefaultToolkit().getScreenSize().height;
601
-				setSize(w - 5, h - 30);
601
+				setSize(w - 0, h - 0);
602 602
 				playAnimationFullscreen.setVisible(true);
603 603
 				toggleLegsButtonFullscreen.setVisible(true);
604
-				cubeCanvas.setBounds(0, 0, w - 5, h - 80);
604
+				cubeCanvas.setBounds(0, 0, w - 0, h - 35);
605 605
 			}
606 606
 		});
607 607
 	
608 608
 		exitButton = new JButton("Exit Fullscreen");
609
-		exitButton.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-150, Toolkit.getDefaultToolkit().getScreenSize().height-80, 150, 25);
609
+		exitButton.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-150, Toolkit.getDefaultToolkit().getScreenSize().height-30, 150, 25);
610 610
 		cp.add(exitButton);
611 611
 		exitButton.addActionListener(new ActionListener() {
612 612
 			public void actionPerformed(ActionEvent evt) {
@@ -636,7 +636,7 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
636 636
 		});
637 637
 	
638 638
 		playAnimationFullscreen.setText("Play");
639
-		playAnimationFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-310, Toolkit.getDefaultToolkit().getScreenSize().height-80, 150, 25);
639
+		playAnimationFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-310, Toolkit.getDefaultToolkit().getScreenSize().height-30, 150, 25);
640 640
 		playAnimationFullscreen.setVisible(false);
641 641
 		cp.add(playAnimationFullscreen);
642 642
 		playAnimationFullscreen.addActionListener(new ActionListener() {
@@ -645,7 +645,7 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
645 645
 			}
646 646
 		});
647 647
 
648
-		toggleLegsButtonFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-470, Toolkit.getDefaultToolkit().getScreenSize().height-80, 150, 25);
648
+		toggleLegsButtonFullscreen.setBounds(Toolkit.getDefaultToolkit().getScreenSize().width-470, Toolkit.getDefaultToolkit().getScreenSize().height-30, 150, 25);
649 649
 		toggleLegsButtonFullscreen.setText("Hide legs");
650 650
 		toggleLegsButtonFullscreen.setVisible(false);
651 651
 		cp.add(toggleLegsButtonFullscreen);
@@ -992,4 +992,4 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
992 992
 		}
993 993
 		return s;
994 994
 	}
995
-}
995
+}

+ 2
- 2
CubeControl/Led3D.java View File

@@ -100,7 +100,7 @@ public class Led3D extends MouseAdapter {
100 100
 
101 101
 		fullScreenMat = new Matrix4d();
102 102
 		fullScreenMat.setRow(0, 0.7597, -0.0204, 0.64926, 0.68);
103
-		fullScreenMat.setRow(1, -0.08, -0.995, 0.061, 0.7);
103
+		fullScreenMat.setRow(1, -0.08, -0.995, 0.061, 0.44);
104 104
 		fullScreenMat.setRow(2, 0.64473, -0.09786, -0.758, -22.88);
105 105
 		fullScreenMat.setRow(3, 0.0, 0.0, 0.0, 1.0);
106 106
 
@@ -314,7 +314,7 @@ public class Led3D extends MouseAdapter {
314 314
 		
315 315
 		if(inFullscreen){
316 316
 			mat.setRow(0, 0.7597, -0.0204, 0.64926, 0.68);
317
-			mat.setRow(1, -0.08, -0.995, 0.061, 0.7);
317
+			mat.setRow(1, -0.08, -0.995, 0.061, 0.44);
318 318
 			mat.setRow(2, 0.64473, -0.09786, -0.758, -22.88);
319 319
 			mat.setRow(3, 0.0, 0.0, 0.0, 1.0);	
320 320
 		} else {

Loading…
Cancel
Save