From 1cc781614270db3e9d6ea94ae4d7e3519b0eebd4 Mon Sep 17 00:00:00 2001
From: piquerez <corentin.piquerez1@etu.univ-lorraine.fr>
Date: Thu, 11 May 2023 15:31:11 +0200
Subject: [PATCH] updated ShukanViewBar.java

---
 shukan/Shukan.java        | 12 ++++--------
 shukan/ShukanViewBar.java |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/shukan/Shukan.java b/shukan/Shukan.java
index 39be6bf..81ccce3 100644
--- a/shukan/Shukan.java
+++ b/shukan/Shukan.java
@@ -1,13 +1,8 @@
 package shukan;
 import javax.swing.JFrame;
-import java.awt.Insets;
-import java.awt.Color;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.GraphicsConfiguration;
 
 
 /**
@@ -70,10 +65,11 @@ public class Shukan
 
 
         // Setting the window geometry
-        frame.add (canvas);
+        frame.add(barre, BorderLayout.NORTH);
+        frame.add (canvas, BorderLayout.CENTER);
         Insets ins = frame.getInsets ();
         frame.setSize (canvas.displayWidth () + ins.left + ins.right,
-                canvas.displayHeight () + ins.top + ins.bottom);
+                canvas.displayHeight ()+ ins.top + ins.bottom);
         frame.setLocation (LEFT_MARGIN, 0);
         frame.setBackground (Color.white);
         frame.setVisible (true);
diff --git a/shukan/ShukanViewBar.java b/shukan/ShukanViewBar.java
index 3d2e647..9b8ca20 100644
--- a/shukan/ShukanViewBar.java
+++ b/shukan/ShukanViewBar.java
@@ -21,7 +21,6 @@ public class ShukanViewBar extends JPanel {
     @Override
     public void paintComponent(Graphics g) {
         super.paintComponents(g);
-        setSize(getWidth(), 80);
         // load images
         try{
             for(int i = 0; i<imagesName.length; i++){
@@ -39,9 +38,10 @@ public class ShukanViewBar extends JPanel {
             public void run() {
                 JFrame f = new JFrame("esssai");
                 ShukanViewBar s = new ShukanViewBar (io,data);
+                f.setSize(1000, 80);
                 f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
                 f.add(s);
-                f.pack();
+
                 f.setVisible(true);
             }
         });
-- 
GitLab