Merge branch 'master' of dwarves.iut-fbleau.fr:justiney/FIprojetAgile2022Groupe3B

iejc
This commit is contained in:
martins 2022-10-24 13:34:09 +02:00
commit 54accd7952
2 changed files with 10 additions and 8 deletions

View File

@ -64,8 +64,8 @@ public class BoutonsMenu extends JComponent{
secondPinceau.drawImage(this.img, 5, 5, this.getWidth()-10, this.getHeight()-10, this);
secondPinceau.fillRoundRect(5, 5, this.getWidth()-10, this.getHeight()-10, this.getWidth()/100*9, this.getHeight()/100*29);
}else{
secondPinceau.drawImage(this.img, 0, 0, this.getWidth()-5, this.getHeight()-5, this);
secondPinceau.fillRoundRect(0, 0, this.getWidth()-5, this.getHeight()-5, this.getWidth()/100*9, this.getHeight()/100*29);
secondPinceau.drawImage(this.img, 0, 0, this.getWidth(), this.getHeight(), this);
secondPinceau.fillRoundRect(0, 0, this.getWidth(), this.getHeight(), this.getWidth()/100*9, this.getHeight()/100*29);
}
secondPinceau.setColor(new Color(255, 255, 255));
secondPinceau.setFont(new Font(Font.SANS_SERIF, Font.BOLD, (this.getWidth()/10)));

View File

@ -2,9 +2,8 @@ package fr.iutfbleau.projetAgile.Puissance4.View;
import java.awt.*;
import javax.swing.*;
import fr.iutfbleau.projetAgile.Puissance4.Utils.Constants;
import fr.iutfbleau.projetAgile.Puissance4.Utils.Constants;
import fr.iutfbleau.projetAgile.Puissance4.Utils.Constants;
public class Pion extends JComponent{
@ -64,10 +63,13 @@ public class Pion extends JComponent{
break;
}
if(this.hover) {
g2.setColor(Pion.HIGHLIGHT_COLOR);
g2.fillRect(0, 0, this.getWidth(), this.getHeight());
g2.setColor(new Color(Pion.HIGHLIGHT_COLOR.getRed(),Pion.HIGHLIGHT_COLOR.getGreen(),Pion.HIGHLIGHT_COLOR.getBlue(), 100));
g2.fillOval(Constants.PIECE_MARGIN, Constants.PIECE_MARGIN, this.getWidth() - 2 * Constants.PIECE_MARGIN, this.getHeight() - 2 * Constants.PIECE_MARGIN);
}
g2.setColor(c);
g2.fillOval(Constants.PIECE_MARGIN, Constants.PIECE_MARGIN, this.getWidth() - 2 * Constants.PIECE_MARGIN, this.getHeight() - 2 * Constants.PIECE_MARGIN);
else {
g2.setColor(c);
g2.fillOval(Constants.PIECE_MARGIN, Constants.PIECE_MARGIN, this.getWidth() - 2 * Constants.PIECE_MARGIN, this.getHeight() - 2 * Constants.PIECE_MARGIN);
}
}
}