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

switch PhaseStepViewer from FlowLayout to MigLayout, fix for the border painting on the GameDuelViewer titlebar.

master
Lodici 2013-10-28 11:04:31 +08:00
parent 2b02b589f7
commit 49ff193cbe
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.xml
View File

@ -25,6 +25,13 @@
<get src="http://search.maven.org/remotecontent?filepath=org/codehaus/groovy/groovy-all/2.1.7/groovy-all-${groovy-version}.jar"
dest="${lib}/groovy-all-${groovy-version}.jar"
skipexisting="true" />
<echo message="downloading MigLayout to ${lib}"/>
<get src="http://repo1.maven.org/maven2/com/miglayout/miglayout-core/4.2/miglayout-core-4.2.jar"
dest="${lib}/miglayout-core-4.2.jar"
skipexisting="true" />
<get src="http://repo1.maven.org/maven2/com/miglayout/miglayout-swing/4.2/miglayout-swing-4.2.jar"
dest="${lib}/miglayout-swing-4.2.jar"
skipexisting="true" />
</target>
<!-- init - Create temporary directory to build the program -->
@ -57,8 +64,8 @@
<jar destfile="release/Magarena.jar" basedir="build" includes="**/*.*">
<manifest>
<attribute name="Main-Class" value="magic.MagicMain" />
<attribute name="SplashScreen-Image" value="magic/data/textures/logo.jpg" />
<attribute name="Class-Path" value="lib/groovy-all-${groovy-version}.jar" />
<attribute name="SplashScreen-Image" value="magic/data/textures/logo.jpg" />
<attribute name="Class-Path" value="lib/groovy-all-${groovy-version}.jar lib/miglayout-core-4.2.jar lib/miglayout-swing-4.2.jar" />
</manifest>
</jar>
</target>

5
src/magic/ui/viewer/GameDuelViewer.java
View File

@ -32,7 +32,7 @@ public class GameDuelViewer extends JPanel implements ChangeListener {
duelViewer=new DuelViewer(game.getDuel());
phaseStepViewer = new PhaseStepViewer();
phaseStepViewer.setBorder(BorderFactory.createMatteBorder(0, 1, 0, 1, Color.BLACK));
phaseStepViewer.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.BLACK));
phaseStepViewer.setOpaque(false);
setSize(320,125);
@ -40,6 +40,7 @@ public class GameDuelViewer extends JPanel implements ChangeListener {
titleBar=new TitleBar("");
add(titleBar,BorderLayout.NORTH);
titleBar.setBorder(BorderFactory.createMatteBorder(1, 1, 0, 1, Color.BLACK));
cardLayout=new CardLayout();
cardPanel=new JPanel(cardLayout);
@ -50,11 +51,9 @@ public class GameDuelViewer extends JPanel implements ChangeListener {
tabSelector=new TabSelector(this,false);
tabSelector.addTab(IconImages.MESSAGE,"Message");
tabSelector.addTab(IconImages.PROGRESS,"Progress");
tabSelector.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, Color.BLACK));
titleBar.add(tabSelector,BorderLayout.EAST);
titleBar.add(phaseStepViewer,BorderLayout.SOUTH);
//add(phaseStepViewer, BorderLayout.SOUTH);
}
public GameViewer getGameViewer() {

8
src/magic/ui/viewer/PhaseStepViewer.java
View File

@ -1,13 +1,10 @@
package magic.ui.viewer;
import java.awt.Color;
import java.awt.Dimension;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JLabel;
import javax.swing.SwingConstants;
import net.miginfocom.swing.MigLayout;
import magic.model.phase.MagicPhaseType;
import magic.ui.theme.Theme;
import magic.ui.theme.ThemeFactory;
@ -26,6 +23,7 @@ public class PhaseStepViewer extends TexturedPanel {
}
private void setMyLayout() {
setLayout(new MigLayout("insets 3 5 3 5"));
setPhaseStepIndicator("UN", "Beginning Phase : Untap Step");
setPhaseStepIndicator("UP", "Beginning Phase : Upkeep Step");
setPhaseStepIndicator("DR", "Beginning Phase : Draw Step");
@ -62,7 +60,7 @@ public class PhaseStepViewer extends TexturedPanel {
lbl.setFont(FontsAndBorders.FONT1);
lbl.setHorizontalAlignment(SwingConstants.CENTER);
lbl.setForeground(Color.GRAY);
add(lbl);
add(lbl, "w 100%");
}
public void setPhaseStep(MagicPhaseType gamePhaseType) {