From 62c0409bb5ea7c82353aeea68d6842798cf75dac Mon Sep 17 00:00:00 2001
From: piquerez <corentin.piquerez1@etu.univ-lorraine.fr>
Date: Sat, 20 May 2023 11:36:54 +0200
Subject: [PATCH] position des boutons ok
---
data/2223_S2/version.txt | 4 ++--
.../data/2223_S2/version.txt | 4 ++--
shukan/ShukanViewBar.java | 21 ++++++++++++-------
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/data/2223_S2/version.txt b/data/2223_S2/version.txt
index b644791..3a5c980 100644
--- a/data/2223_S2/version.txt
+++ b/data/2223_S2/version.txt
@@ -1,2 +1,2 @@
-10
-230519
+11
+230520
diff --git a/out/production/sae2.01-developpement-application/data/2223_S2/version.txt b/out/production/sae2.01-developpement-application/data/2223_S2/version.txt
index b644791..3a5c980 100644
--- a/out/production/sae2.01-developpement-application/data/2223_S2/version.txt
+++ b/out/production/sae2.01-developpement-application/data/2223_S2/version.txt
@@ -1,2 +1,2 @@
-10
-230519
+11
+230520
diff --git a/shukan/ShukanViewBar.java b/shukan/ShukanViewBar.java
index 7d39775..9b72e5b 100644
--- a/shukan/ShukanViewBar.java
+++ b/shukan/ShukanViewBar.java
@@ -17,12 +17,12 @@ public class ShukanViewBar extends JPanel {
/** Hauteur en pixels de la barre d'outils */
private int height;
/** Barre contenant tous les boutons */
- private JPanel fonct;
+ private JPanel p_left, p_right;
/** Construit la barre d'outils */
public ShukanViewBar(int height) {
- fonct = new JPanel();
-
+ p_left = new JPanel();
+ p_right = new JPanel();
this.height = height;
for (int i = 0; i < imagesName.length; i++) {
@@ -30,15 +30,20 @@ public class ShukanViewBar extends JPanel {
buttons[i].setPreferredSize(new Dimension(85, 85));
buttons[i].setBackground(Color.WHITE);
buttons[i].setBorder(new LineBorder(Color.WHITE));
- fonct.add(buttons[i]);
+
+ if (i<imagesName.length-2)
+ p_left.add(buttons[i]);
+ else
+ p_right.add(buttons[i]);
}
- // Définir la taille personnalisée pour la JPanel
- fonct.setPreferredSize(new Dimension(300, height + 10));
- fonct.setBackground(Color.WHITE);
+
+ p_left.setBackground(Color.WHITE);
+ p_right.setBackground(Color.WHITE);
setLayout(new BorderLayout());
- add(fonct, BorderLayout.CENTER);
+ add(p_left, BorderLayout.WEST);
+ add(p_right, BorderLayout.EAST);
setBackground(Color.WHITE);
}
--
GitLab