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

try to do fewer layout calculations when moving cards

Browse Source
This commit is contained in:
Peter F. Patel-Schneider
2019-02-02 16:46:23 -05:00
parent 30607291fc
commit 31bca6c614
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
View File

@@ -291,6 +291,9 @@ public abstract class CardPanelContainer extends SkinnedPanel {
} }
public final void removeCardPanel(final CardPanel fromPanel) { public final void removeCardPanel(final CardPanel fromPanel) {
removeCardPanel(fromPanel,true);
}
public final void removeCardPanel(final CardPanel fromPanel, final boolean repaint) {
FThreads.assertExecutedByEdt(true); FThreads.assertExecutedByEdt(true);
if (getMouseDragPanel() != null) { if (getMouseDragPanel() != null) {
CardPanel.getDragAnimationPanel().setVisible(false); CardPanel.getDragAnimationPanel().setVisible(false);
@@ -303,10 +306,12 @@ public abstract class CardPanelContainer extends SkinnedPanel {
fromPanel.dispose(); fromPanel.dispose();
getCardPanels().remove(fromPanel); getCardPanels().remove(fromPanel);
remove(fromPanel); remove(fromPanel);
if ( repaint ) {
invalidate(); invalidate();
repaint(); repaint();
doingLayout(); doingLayout();
} }
}
public final void setCardPanels(final List<CardPanel> cardPanels) { public final void setCardPanels(final List<CardPanel> cardPanels) {
if (cardPanels.size() == 0) { if (cardPanels.size() == 0) {
@@ -332,17 +337,22 @@ public abstract class CardPanelContainer extends SkinnedPanel {
} }
public final void clear() { public final void clear() {
clear(true);
}
public final void clear(final boolean repaint) {
FThreads.assertExecutedByEdt(true); FThreads.assertExecutedByEdt(true);
for (final CardPanel p : getCardPanels()) { for (final CardPanel p : getCardPanels()) {
p.dispose(); p.dispose();
} }
getCardPanels().clear(); getCardPanels().clear();
removeAll(); removeAll();
if ( repaint ) {
setPreferredSize(new Dimension(0, 0)); setPreferredSize(new Dimension(0, 0));
invalidate(); invalidate();
getParent().validate(); getParent().validate();
repaint(); repaint();
} }
}
public final FScrollPane getScrollPane() { public final FScrollPane getScrollPane() {
return this.scrollPane; return this.scrollPane;

10
forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
View File

@@ -620,11 +620,11 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
toDelete.removeAll(notToDelete); toDelete.removeAll(notToDelete);
if (toDelete.size() == getCardPanels().size()) { if (toDelete.size() == getCardPanels().size()) {
clear(); clear(false);
} }
else { else {
for (final CardView card : toDelete) { for (final CardView card : toDelete) {
removeCardPanel(getCardPanel(card.getId())); removeCardPanel(getCardPanel(card.getId()),false);
} }
} }
@@ -650,14 +650,16 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
doLayout(); doLayout();
} }
invalidate(); //pfps do the extra invalidate before any scrolling
if (!newPanels.isEmpty()) { if (!newPanels.isEmpty()) {
int i = newPanels.size();
for (final CardPanel toPanel : newPanels) { for (final CardPanel toPanel : newPanels) {
if ( --i == 0 ) { // only scroll to last panel to be added
scrollRectToVisible(new Rectangle(toPanel.getCardX(), toPanel.getCardY(), toPanel.getCardWidth(), toPanel.getCardHeight())); scrollRectToVisible(new Rectangle(toPanel.getCardX(), toPanel.getCardY(), toPanel.getCardWidth(), toPanel.getCardHeight()));
}
Animation.moveCard(toPanel); Animation.moveCard(toPanel);
} }
} }
invalidate();
repaint(); repaint();
} }