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

Targeting overlay isn't maturing as I'd hoped. It's now disabled until further notice. Code will remain in place if someone wants to tackle it.

Browse Source
This commit is contained in:
Doublestrike
2012-10-21 05:50:01 +00:00
parent 2df878d1d2
commit a928f6be67
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/gui/match/TargetingOverlay.java
View File

@@ -82,8 +82,7 @@ public enum TargetingOverlay {
// Draw only hovered card // Draw only hovered card
for (VField f : fields) { for (VField f : fields) {
if (f.getTabletop().getCardFromMouseOverPanel() != null) { if (f.getTabletop().getCardFromMouseOverPanel() != null) {
cardPanels.add(f.getTabletop().getMouseOverPanel()); cardPanels.addAll(f.getTabletop().getCardPanels());
break;
} }
} }
break; break;

2
src/main/java/forge/gui/match/views/VDock.java
View File

@@ -97,7 +97,7 @@ public enum VDock implements IVDoc<CDock> {
pnl.add(btnOpenLayout); pnl.add(btnOpenLayout);
pnl.add(btnSaveLayout); pnl.add(btnSaveLayout);
pnl.add(btnAlphaStrike); pnl.add(btnAlphaStrike);
pnl.add(btnTargeting); // pnl.add(btnTargeting);
} }
/* (non-Javadoc) /* (non-Javadoc)

3
src/main/java/forge/view/FView.java
View File

@@ -23,7 +23,6 @@ import forge.gui.framework.DragCell;
import forge.gui.framework.EDocID; import forge.gui.framework.EDocID;
import forge.gui.framework.SLayoutConstants; import forge.gui.framework.SLayoutConstants;
import forge.gui.home.VHomeUI; import forge.gui.home.VHomeUI;
import forge.gui.match.TargetingOverlay;
import forge.gui.match.VMatchUI; import forge.gui.match.VMatchUI;
import forge.gui.toolbox.FOverlay; import forge.gui.toolbox.FOverlay;
import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FPanel;
@@ -83,7 +82,7 @@ public enum FView {
// Note: when adding new panels here, keep in mind that the layered pane // Note: when adding new panels here, keep in mind that the layered pane
// has a null layout, so new components will be W0 x H0 pixels - gotcha! // has a null layout, so new components will be W0 x H0 pixels - gotcha!
// FControl has a method called "sizeComponents" which will fix this. // FControl has a method called "sizeComponents" which will fix this.
lpnDocument.add(TargetingOverlay.SINGLETON_INSTANCE.getPanel(), TARGETING_LAYER); // lpnDocument.add(TargetingOverlay.SINGLETON_INSTANCE.getPanel(), TARGETING_LAYER);
pnlInsets.add(pnlContent, BorderLayout.CENTER); pnlInsets.add(pnlContent, BorderLayout.CENTER);
pnlInsets.setBackgroundTexture(FSkin.getIcon(FSkin.Backgrounds.BG_TEXTURE)); pnlInsets.setBackgroundTexture(FSkin.getIcon(FSkin.Backgrounds.BG_TEXTURE));

5
src/main/java/forge/view/arcane/CardPanelContainer.java
View File

@@ -559,11 +559,6 @@ public abstract class CardPanelContainer extends JPanel {
} }
} }
/** @return {@link forge.view.arcane.CardPanel} */
public final CardPanel getMouseOverPanel() {
return this.hoveredPanel;
}
/** /**
* <p> * <p>
* getCardFromMouseOverPanel. * getCardFromMouseOverPanel.