External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

GUI: fix some text colors not using the theme color (#12737)

Browse source 
Co-authored-by: TandEm <tandem@users.noreply.github.com>
This commit is contained in:
TandEm 2024-08-27 02:17:34 +10:00 • committed by GitHub
parent 71ac5cf11f
commit 8b57b7ee75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -431,7 +431,7 @@
text = text + Integer.toString(second); text = text + Integer.toString(second);
} }
this.editTimeRemaining.setText(text); this.editTimeRemaining.setText(text);
// red color for small time // red color for small time
Color timerColor; Color timerColor;
if (s <= 10) { if (s <= 10) {
@ -439,10 +439,10 @@
} else if (s <= 30) { } else if (s <= 30) {
timerColor = new Color(255, 160, 60); // orange timerColor = new Color(255, 160, 60); // orange
} else { } else {
timerColor = Color.BLACK; timerColor = PreferencesDialog.getCurrentTheme().getTextColor();
} }
this.editTimeRemaining.setForeground(timerColor); this.editTimeRemaining.setForeground(timerColor);
// warning sound at the end // warning sound at the end
if (s == 6 && !draftBooster.isEmptyGrid()) { if (s == 6 && !draftBooster.isEmptyGrid()) {
AudioManager.playOnCountdown1(); AudioManager.playOnCountdown1();

10
Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
View file

@ -287,10 +287,10 @@ public class PlayerPanelExt extends javax.swing.JPanel {
changedFontLife = false; changedFontLife = false;
} }
setTextForLabel("life", lifeLabel, life, playerLife, false, PreferencesDialog.getCurrentTheme().getTextColor()); setTextForLabel("life", lifeLabel, life, playerLife, false, PreferencesDialog.getCurrentTheme().getTextColor());
setTextForLabel("poison", poisonLabel, poison, counterOfName(player, "poison"), false); setTextForLabel("poison", poisonLabel, poison, counterOfName(player, "poison"), false, PreferencesDialog.getCurrentTheme().getTextColor());
setTextForLabel("energy", energyLabel, energy, counterOfName(player, "energy"), false); setTextForLabel("energy", energyLabel, energy, counterOfName(player, "energy"), false, PreferencesDialog.getCurrentTheme().getTextColor());
setTextForLabel("experience", experienceLabel, experience, counterOfName(player, "experience"), false); setTextForLabel("experience", experienceLabel, experience, counterOfName(player, "experience"), false, PreferencesDialog.getCurrentTheme().getTextColor());
setTextForLabel("rad", radLabel, rad, counterOfName(player, "rad"), false); setTextForLabel("rad", radLabel, rad, counterOfName(player, "rad"), false, PreferencesDialog.getCurrentTheme().getTextColor());
setTextForLabel("hand zone", handLabel, hand, player.getHandCount(), false, PreferencesDialog.getCurrentTheme().getTextColor()); setTextForLabel("hand zone", handLabel, hand, player.getHandCount(), false, PreferencesDialog.getCurrentTheme().getTextColor());
int libraryCards = player.getLibraryCount(); int libraryCards = player.getLibraryCount();
if (libraryCards > 99) { if (libraryCards > 99) {
@ -325,7 +325,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
setTextForLabel("graveyard zone", graveLabel, grave, graveCards, false, graveColor); setTextForLabel("graveyard zone", graveLabel, grave, graveCards, false, graveColor);
graveLabel.setToolTipText("Card Types: " + qtyCardTypes(player.getGraveyard())); graveLabel.setToolTipText("Card Types: " + qtyCardTypes(player.getGraveyard()));
Color commandColor = Color.BLACK; Color commandColor = PreferencesDialog.getCurrentTheme().getTextColor();
for (CommandObjectView com : player.getCommandObjectList()) { for (CommandObjectView com : player.getCommandObjectList()) {
if (game != null && game.getCanPlayObjects() != null && game.getCanPlayObjects().containsObject(com.getId())) { if (game != null && game.getCanPlayObjects() != null && game.getCanPlayObjects().containsObject(com.getId())) {
commandColor = activeValueColor; commandColor = activeValueColor;