boudjeml/FIProjetIHM2022
1
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

$

Browse Source
This commit is contained in:
Bilou 2022-12-07 15:09:11 +01:00
parent a67fe4ffb1
commit e988e3f7fe
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Test/CustomJButton.java
View File

@ -7,23 +7,10 @@ import java.awt.Font;
public class CustomJButton extends JButton {
<<<<<<< HEAD
private Font font;
private Color color;
//private final int radius = 20;
=======
private int fontSize = 12;
private Font font = new Font("Arial", Font.PLAIN, 12);
private Color color = Color.BLACK;
/**
* @param text texte affiché dans le bouton
*/
public CustomJButton(String text) {
super(text);
init();
}
/**
* @param text texte affiché dans le bouton
* @param fontSize taille du texte
@ -34,7 +21,6 @@ public class CustomJButton extends JButton {
this.fontSize = fontSize;
this.font = new Font("Arial", Font.PLAIN, this.fontSize);
}
>>>>>>> 4783da6dededc5e27a237ab661d2059eec57e69c
/**
* @param text texte affiché dans le bouton
@ -63,16 +49,11 @@ public class CustomJButton extends JButton {
*/
public CustomJButton(String text, Font font, Color c) {
super(text);
<<<<<<< HEAD
this.color = Color.BLACK;
=======
this.color = c;
>>>>>>> 4783da6dededc5e27a237ab661d2059eec57e69c
this.font = font;
this.init();
}
<<<<<<< HEAD
/**
* @param text texte affiché dans le bouton
*/
@ -84,8 +65,6 @@ public class CustomJButton extends JButton {
}
=======
>>>>>>> 4783da6dededc5e27a237ab661d2059eec57e69c
private void init() {
this.setForeground(Color.WHITE);
this.setBackground(this.color);