Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

GUI: improved feedback needed sound notifications (plays only for inactive game or app, see #6853);

Browse source
This commit is contained in:
Oleg Agafonov 2020-07-31 20:00:36 +04:00
parent c343767e8e
commit 610baac6ab
6 changed files with 828 additions and 804 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Client/src/main/java/mage/client/game/HelperPanel.java
View file

@ -1,4 +1,3 @@
package mage.client.game;
import mage.client.SessionHandler;
@ -6,7 +5,9 @@ import mage.client.components.MageTextArea;
import mage.client.constants.Constants;
import mage.client.dialog.PreferencesDialog;
import mage.client.game.FeedbackPanel.FeedbackMode;
import mage.client.util.AppUtil;
import mage.client.util.GUISizeHelper;
import mage.client.util.audio.AudioManager;
import mage.constants.TurnPhase;
import javax.swing.*;
@ -64,6 +65,18 @@ public class HelperPanel extends JPanel {
private boolean gameNeedFeedback = false;
private TurnPhase gameTurnPhase = null;
private Timer needFeedbackTimer;
{
// start timer to inform user about needed feedback (example: inform by sound play)
needFeedbackTimer = new Timer(100, evt -> SwingUtilities.invokeLater(() -> {
needFeedbackTimer.stop();
if (!AppUtil.isAppActive() || !AppUtil.isGameActive(this.gameId)) {
AudioManager.playFeedbackNeeded();
}
}));
}
public HelperPanel() {
initComponents();
}
@ -297,7 +310,7 @@ public class HelperPanel extends JPanel {
public void autoSizeButtonsAndFeedbackState() {
// two mode: same size for small texts (flow), different size for long texts (grid)
// plus colorize feedback panel on player's priority
// also colorize feedback panel on player's priority and enable sound notification
int BUTTONS_H_GAP = 15;
Color ACTIVE_FEEDBACK_BACKGROUND_COLOR_MAIN = new Color(0, 0, 255, 50);
@ -325,6 +338,10 @@ public class HelperPanel extends JPanel {
// color panel on player's feedback waiting
if (this.gameNeedFeedback) {
// start notification sound timer
this.needFeedbackTimer.restart();
// wait player's action
switch (FEEDBACK_COLORIZING_MODE) {
case Constants.BATTLEFIELD_FEEDBACK_COLORIZING_MODE_DISABLE:
@ -362,6 +379,9 @@ public class HelperPanel extends JPanel {
break;
}
} else {
// stop notification sound timer
this.needFeedbackTimer.stop();
// inform about other players
this.mainPanel.setOpaque(false);
}