From 6cc54b095d60ef0cca46b3cb5dbd6c2591c82e6b Mon Sep 17 00:00:00 2001
From: CHEVALIER Noemy <noemy.chevalier7@etu.univ-lorraine.fr>
Date: Tue, 30 May 2023 19:49:55 +0000
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
shukan/Shukan.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/shukan/Shukan.java b/shukan/Shukan.java
index 6aa87c5..9b02c18 100644
--- a/shukan/Shukan.java
+++ b/shukan/Shukan.java
@@ -38,7 +38,6 @@ public class Shukan
JPanel global = new JPanel(new BorderLayout());
ShukanView canvas = new ShukanView (data, io);
ShukanViewBar mytoolbar = new ShukanViewBar(90);
- ShukanStudent student = new ShukanStudent(data,60);
// Getting the display size
@@ -49,11 +48,10 @@ public class Shukan
canvas.restrictSize ((int) (gcBounds.getWidth ()) - LEFT_MARGIN,
(int) (gcBounds.getHeight ()) - TOP_MARGIN - mytoolbar.getHeight());
mytoolbar.setSize(new Dimension((int) (gcBounds.getWidth ()) - LEFT_MARGIN, mytoolbar.getHeight()));
- student.setSize(new Dimension((int) (gcBounds.getWidth ()) - LEFT_MARGIN, student.getHeight()));
// Adding a openGL input handler (controller)
- ShukanController myController = new ShukanController (canvas, mytoolbar, data, student);
+ ShukanController myController = new ShukanController (canvas, mytoolbar, data);
canvas.addKeyListener (myController);
canvas.addMouseListener (myController);
mytoolbar.addActionListener(myController);
@@ -77,11 +75,11 @@ public class Shukan
// Setting the window geometry
global.add(mytoolbar, BorderLayout.NORTH);
global.add (canvas, BorderLayout.CENTER);
- global.add(student, BorderLayout.SOUTH);
+ //global.add(student, BorderLayout.SOUTH);
frame.add(global);
Insets ins = frame.getInsets ();
frame.setSize (canvas.displayWidth () + ins.left + ins.right,
- canvas.displayHeight ()+ mytoolbar.getHeight()+ student.getHeight() + ins.top + ins.bottom );
+ canvas.displayHeight ()+ mytoolbar.getHeight()+ ins.top + ins.bottom );
frame.setLocation (LEFT_MARGIN, 0);
frame.setBackground (Color.white);
frame.setVisible (true);
--
GitLab