external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent "Waiting for opponent..." appearing while input dialog open

Browse Source
This commit is contained in:
drdev
2014-08-10 03:53:12 +00:00
parent c155c7f0f5
commit 23293a5983
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/view/FDialog.java
View File

@@ -2,6 +2,7 @@ package forge.view;
import forge.Singletons; import forge.Singletons;
import forge.assets.FSkinProp; import forge.assets.FSkinProp;
import forge.match.input.InputBase;
import forge.toolbox.FMouseAdapter; import forge.toolbox.FMouseAdapter;
import forge.toolbox.FPanel; import forge.toolbox.FPanel;
import forge.toolbox.FSkin; import forge.toolbox.FSkin;
@@ -129,6 +130,7 @@ public class FDialog extends SkinnedDialog implements ITitleBarOwner, KeyEventDi
if (visible) { if (visible) {
FMouseAdapter.forceMouseUp(); //ensure mouse up handled if dialog shown between mouse down and mouse up FMouseAdapter.forceMouseUp(); //ensure mouse up handled if dialog shown between mouse down and mouse up
InputBase.cancelAwaitNextInput(); //ensure "Waiting for opponent..." prompt doesn't appear while dialog awaiting input
if (openModals.isEmpty()) { if (openModals.isEmpty()) {
setLocationRelativeTo(JOptionPane.getRootFrame()); setLocationRelativeTo(JOptionPane.getRootFrame());

2
forge-gui-mobile/src/forge/toolbox/FDialog.java
View File

@@ -9,6 +9,7 @@ import forge.assets.FSkinFont;
import forge.assets.FSkinImage; import forge.assets.FSkinImage;
import forge.assets.FSkinTexture; import forge.assets.FSkinTexture;
import forge.assets.FSkinColor.Colors; import forge.assets.FSkinColor.Colors;
import forge.match.input.InputBase;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.util.Utils; import forge.util.Utils;
@@ -57,6 +58,7 @@ public abstract class FDialog extends FOverlay {
if (visible0) { if (visible0) {
openDialogCount++; openDialogCount++;
InputBase.cancelAwaitNextInput(); //ensure "Waiting for opponent..." prompt doesn't appear while dialog awaiting input
} }
else if (openDialogCount > 0) { else if (openDialogCount > 0) {
openDialogCount--; openDialogCount--;