summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip <pacardon@u.washington.edu>2011-03-07 03:31:48 +0000
committerPhillip <pacardon@u.washington.edu>2011-03-07 03:31:48 +0000
commit8c6ac67452f4f403eb8fcea311af06dcb1f43439 (patch)
treebff11b416f287363f924372591b8e25a37811a61
parent58c224e1ef76d0c213464617fb464f3cc09722f1 (diff)
Parameter windows will now "follow" their parent window.
-rw-r--r--src/tesseract/newmenu/MenuItem.java18
-rw-r--r--src/tesseract/newmenu/NewChainLinkMenuItem.java1
-rw-r--r--src/tesseract/newmenu/NewEllipsoidMenuItem.java1
-rw-r--r--src/tesseract/newmenu/NewIcosahedronMenuItem.java1
-rw-r--r--src/tesseract/newmenu/NewParticleEmitterMenuItem.java1
-rw-r--r--src/tesseract/newmenu/NewParticleMenuItem.java1
-rw-r--r--src/tesseract/newmenu/NewPlanarPolygonMenuItem.java1
-rw-r--r--src/tesseract/newmenu/NewToroidMenuItem.java1
8 files changed, 23 insertions, 2 deletions
diff --git a/src/tesseract/newmenu/MenuItem.java b/src/tesseract/newmenu/MenuItem.java
index 6507b52..67f729a 100644
--- a/src/tesseract/newmenu/MenuItem.java
+++ b/src/tesseract/newmenu/MenuItem.java
@@ -96,6 +96,11 @@ public abstract class MenuItem extends JMenuItem implements ActionListener {
private boolean useColorButton;
/**
+ * Parent frame
+ */
+ private JFrame myParent;
+
+ /**
* Constructor.
* @param theWorld world parameter.
* @param theLabel for menu item.
@@ -116,6 +121,7 @@ public abstract class MenuItem extends JMenuItem implements ActionListener {
myParamFrame.setLayout(new BorderLayout());
myColorButton = new JButton("Color");
myColor = Color.RED;
+ myParent = new JFrame();
}
/**
@@ -263,10 +269,18 @@ public abstract class MenuItem extends JMenuItem implements ActionListener {
}
/**
- * Set Parent
+ * Set Parent.
* @param theParent frame.
*/
- public void setParent (final JFrame theParent) {
+ public void setParent(final JFrame theParent) {
myParamFrame.setLocationRelativeTo(theParent);
+ myParent = theParent;
+ }
+
+ /**
+ * Set Parent.
+ */
+ public void setParent() {
+ myParamFrame.setLocationRelativeTo(myParent);
}
}
diff --git a/src/tesseract/newmenu/NewChainLinkMenuItem.java b/src/tesseract/newmenu/NewChainLinkMenuItem.java
index 04a58a2..a6ab927 100644
--- a/src/tesseract/newmenu/NewChainLinkMenuItem.java
+++ b/src/tesseract/newmenu/NewChainLinkMenuItem.java
@@ -58,6 +58,7 @@ public class NewChainLinkMenuItem extends MenuItem {
@Override
public void actionPerformed(final ActionEvent e) {
//createParameterMenu();
+ setParent();
this.getParamFrame().pack();
this.getParamFrame().setVisible(true);
}
diff --git a/src/tesseract/newmenu/NewEllipsoidMenuItem.java b/src/tesseract/newmenu/NewEllipsoidMenuItem.java
index a1132ad..5e23a43 100644
--- a/src/tesseract/newmenu/NewEllipsoidMenuItem.java
+++ b/src/tesseract/newmenu/NewEllipsoidMenuItem.java
@@ -55,6 +55,7 @@ public class NewEllipsoidMenuItem extends MenuItem {
@Override
public void actionPerformed(final ActionEvent e) {
+ setParent();
this.getParamFrame().pack();
this.getParamFrame().setVisible(true);
}
diff --git a/src/tesseract/newmenu/NewIcosahedronMenuItem.java b/src/tesseract/newmenu/NewIcosahedronMenuItem.java
index 4085773..b337d8f 100644
--- a/src/tesseract/newmenu/NewIcosahedronMenuItem.java
+++ b/src/tesseract/newmenu/NewIcosahedronMenuItem.java
@@ -51,6 +51,7 @@ public class NewIcosahedronMenuItem extends MenuItem {
@Override
public void actionPerformed(final ActionEvent e) {
+ setParent();
this.getParamFrame().pack();
this.getParamFrame().setVisible(true);
}
diff --git a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java
index c1d7c9d..4ad08f8 100644
--- a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java
+++ b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java
@@ -61,6 +61,7 @@ public class NewParticleEmitterMenuItem extends MenuItem {
@Override
public void actionPerformed(final ActionEvent e) {
+ setParent();
this.getParamFrame().pack();
this.getParamFrame().setVisible(true);
}
diff --git a/src/tesseract/newmenu/NewParticleMenuItem.java b/src/tesseract/newmenu/NewParticleMenuItem.java
index 9973b27..9b7c422 100644
--- a/src/tesseract/newmenu/NewParticleMenuItem.java
+++ b/src/tesseract/newmenu/NewParticleMenuItem.java
@@ -58,6 +58,7 @@ public class NewParticleMenuItem extends MenuItem {
@Override
public void actionPerformed(final ActionEvent e) {
+ setParent();
this.getParamFrame().pack();
this.getParamFrame().setVisible(true);
}
diff --git a/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java b/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java
index 7fedf12..9ff4a54 100644
--- a/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java
+++ b/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java
@@ -57,6 +57,7 @@ public class NewPlanarPolygonMenuItem extends MenuItem {
@Override
public void actionPerformed(final ActionEvent e) {
+ setParent();
this.getParamFrame().pack();
this.getParamFrame().setVisible(true);
}
diff --git a/src/tesseract/newmenu/NewToroidMenuItem.java b/src/tesseract/newmenu/NewToroidMenuItem.java
index 1c56fbb..76005c1 100644
--- a/src/tesseract/newmenu/NewToroidMenuItem.java
+++ b/src/tesseract/newmenu/NewToroidMenuItem.java
@@ -62,6 +62,7 @@ public class NewToroidMenuItem extends MenuItem {
@Override
public void actionPerformed(final ActionEvent e) {
+ setParent();
this.getParamFrame().pack();
this.getParamFrame().setVisible(true);
}