philippe.lhardy/artloglaby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/twocontrols'

Browse Source
This commit is contained in:
philippe lhardy
2017-11-16 21:53:39 +01:00
parent c995d0748b 698394d9e1
commit 50bad7a474
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/org/artisanlogiciel/games/Display.java
View File

@@ -66,7 +66,8 @@ public class Display extends JFrame
Container con = this.getContentPane(); Container con = this.getContentPane();
con.add(new JScrollPane(maze), BorderLayout.CENTER); con.add(new JScrollPane(maze), BorderLayout.CENTER);
controler = new MazeControler(); controler = new MazeControler();
con.add(controler, BorderLayout.NORTH); con.add(controler.getMoveControl(), BorderLayout.NORTH);
con.add(controler.getGenerationControl(), BorderLayout.SOUTH);
addComponentListener(new ComponentAdapter() { addComponentListener(new ComponentAdapter() {
@Override @Override
@@ -270,11 +271,13 @@ public class Display extends JFrame
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private MazeSettings settings = null;
public MazeControler() public MazeControler()
{ {
MazeSettings settings = new MazeSettings();
controlPanel = new JPanel(); controlPanel = new JPanel();
settings = new MazeSettings();
JButton button = new JButton("Resolve"); JButton button = new JButton("Resolve");
button.addActionListener(new ActionListener() button.addActionListener(new ActionListener()
{ {
@@ -380,6 +383,16 @@ public class Display extends JFrame
add(settings,BorderLayout.EAST); add(settings,BorderLayout.EAST);
} }
private JPanel getMoveControl()
{
return this;
}
private JPanel getGenerationControl()
{
return settings;
}
} }
private JButton addDirection(final JPanel panel, final String direction, String key, Action goAction) private JButton addDirection(final JPanel panel, final String direction, String key, Action goAction)