Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #1065 : click on already selected deck tab opens the deck selection screen.

master
lodici 2017-03-07 20:26:11 +00:00
parent 8828a7c18f
commit ddbf8f7f01
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/magic/ui/screen/deck/editor/ContentPanel.java
View File

@ -111,4 +111,8 @@ class ContentPanel extends JPanel {
pwlWorker.execute();
}
void showDecksScreen() {
screen.showDecksScreen();
}
}

2
src/magic/ui/screen/deck/editor/DeckEditorScreen.java
View File

@ -175,7 +175,7 @@ public class DeckEditorScreen extends HeaderFooterScreen implements IDeckConsume
: null;
}
private void showDecksScreen() {
void showDecksScreen() {
ScreenController.showDecksScreen(this);
}

23
src/magic/ui/screen/deck/editor/MainViewsPanel.java
View File

@ -2,9 +2,12 @@ package magic.ui.screen.deck.editor;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.AbstractAction;
import javax.swing.JPanel;
import javax.swing.JToggleButton;
import javax.swing.SwingUtilities;
import magic.data.GeneralConfig;
import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
@ -94,9 +97,25 @@ class MainViewsPanel extends JPanel
};
}
private void setOpenDecksScreenOnClick(JToggleButton btn) {
btn.addMouseListener(new MouseAdapter() {
private boolean isSelected;
@Override
public void mousePressed(MouseEvent e) {
isSelected = btn.isSelected();
}
@Override
public void mouseReleased(MouseEvent e) {
if (isSelected && SwingUtilities.isLeftMouseButton(e)) {
container.showDecksScreen();
}
}
});
}
private void addToggleButtons() {
toggleButtonsPanel.addToggleButton(MText.get(_S1), new AbstractAction() {
JToggleButton btn = toggleButtonsPanel.addToggleButton(MText.get(_S1), new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
MouseHelper.showBusyCursor((Component) e.getSource());
@ -105,6 +124,8 @@ class MainViewsPanel extends JPanel
MouseHelper.showHandCursor((Component) e.getSource());
}
});
setOpenDecksScreenOnClick(btn);
toggleButtonsPanel.addToggleButton(MText.get(_S2), new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {