github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: added info about combat arrows bug on re-connect

Browse source
This commit is contained in:
Oleg Agafonov 2020-08-02 14:22:59 +04:00
parent 00411b4a9b
commit c9c1bc2b90
2 changed files with 277 additions and 269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
View file

@ -1,39 +1,32 @@
package mage.client.game;
import mage.cards.MagePermanent;
import mage.client.cards.BigCard;
import mage.client.cards.Permanent;
import mage.client.dialog.PreferencesDialog;
import mage.client.plugins.impl.Plugins;
import mage.client.util.ClientDefaultSettings;
import mage.client.util.GUISizeHelper;
import mage.client.util.audio.AudioManager;
import mage.client.util.layout.CardLayoutStrategy;
import mage.client.util.layout.impl.OldCardLayoutStrategy;
import mage.view.CounterView;
import mage.view.PermanentView;
/* import javax.swing.*;
* BattlefieldPanel.java import javax.swing.border.Border;
* import javax.swing.border.EmptyBorder;
* Created on 10-Jan-2010, 10:43:14 PM import java.awt.*;
*/ import java.awt.event.ComponentAdapter;
package mage.client.game; import java.awt.event.ComponentEvent;
import java.util.List;
import java.util.*;
import java.util.Map.Entry;
import mage.cards.MagePermanent; /**
import mage.client.cards.BigCard;
import mage.client.cards.Permanent;
import mage.client.dialog.PreferencesDialog;
import mage.client.plugins.impl.Plugins;
import mage.client.util.ClientDefaultSettings;
import mage.client.util.GUISizeHelper;
import mage.client.util.audio.AudioManager;
import mage.client.util.layout.CardLayoutStrategy;
import mage.client.util.layout.impl.OldCardLayoutStrategy;
import mage.view.CounterView;
import mage.view.PermanentView;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import java.awt.*;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.util.List;
import java.util.*;
import java.util.Map.Entry;
/**
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class BattlefieldPanel extends javax.swing.JLayeredPane { public class BattlefieldPanel extends javax.swing.JLayeredPane {
private final Map<UUID, MagePermanent> permanents = new LinkedHashMap<>(); private final Map<UUID, MagePermanent> permanents = new LinkedHashMap<>();
private UUID gameId; private UUID gameId;
@ -45,7 +38,6 @@
private JLayeredPane jPanel; private JLayeredPane jPanel;
private JScrollPane jScrollPane; private JScrollPane jScrollPane;
private int width;
private final CardLayoutStrategy layoutStrategy = new OldCardLayoutStrategy(); private final CardLayoutStrategy layoutStrategy = new OldCardLayoutStrategy();
@ -70,15 +62,16 @@
addComponentListener(new ComponentAdapter() { addComponentListener(new ComponentAdapter() {
@Override @Override
public void componentResized(ComponentEvent e) { public void componentResized(ComponentEvent e) {
int width = e.getComponent().getWidth(); updateSize();
int height = e.getComponent().getHeight();
BattlefieldPanel.this.jScrollPane.setSize(width, height);
BattlefieldPanel.this.width = width;
sortLayout();
} }
}); });
} }
public void updateSize() {
this.jScrollPane.setSize(this.getWidth(), this.getHeight());
sortLayout();
}
public void init(UUID gameId, BigCard bigCard) { public void init(UUID gameId, BigCard bigCard) {
this.gameId = gameId; this.gameId = gameId;
this.bigCard = bigCard; this.bigCard = bigCard;
@ -215,7 +208,7 @@
return; return;
} }
layoutStrategy.doLayout(this, width); layoutStrategy.doLayout(this, this.getWidth());
this.jScrollPane.repaint(); this.jScrollPane.repaint();
this.jScrollPane.revalidate(); this.jScrollPane.revalidate();
@ -321,4 +314,4 @@
public Map<String, JComponent> getUiComponentsList() { public Map<String, JComponent> getUiComponentsList() {
return uiComponentsList; return uiComponentsList;
} }
} }

15
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -611,6 +611,21 @@ public final class GamePanel extends javax.swing.JPanel {
this.pnlBattlefield.add(topPanel, panelC); this.pnlBattlefield.add(topPanel, panelC);
panelC.gridy = 1; panelC.gridy = 1;
this.pnlBattlefield.add(bottomPanel, panelC); this.pnlBattlefield.add(bottomPanel, panelC);
// TODO: combat arrows aren't visible on re-connect, must click on avatar to update correctrly
// reason: panels aren't visible/located here, so battlefieldpanel see wrong sizes
// recalc all component sizes and update permanents/arrows positions
// if you don't do it here then will catch wrong arrows drawing on re-connect (no sortLayout calls)
/*
this.validate();
for (Map.Entry<UUID, PlayAreaPanel> p : players.entrySet()) {
PlayerView playerView = game.getPlayers().stream().filter(view -> view.getPlayerId().equals(p.getKey())).findFirst().orElse(null);
if (playerView != null) {
p.getValue().getBattlefieldPanel().updateSize();
p.getValue().update(null, playerView, null);
}
}
*/
} }
public synchronized void updateGame(GameView game) { public synchronized void updateGame(GameView game) {