diff --git a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java index 3da4921..bd10926 100644 --- a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java +++ b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java @@ -184,7 +184,7 @@ throw new RuntimeException( "PComboBox.setEnvironment( swing, pCanvas );//has to be done manually at present"); } - Rectangle2D r1c = pSwing.getBounds(); + Rectangle2D r1c = new Rectangle2D.Double(pSwing.getX(), pSwing.getY(), getWidth(), getHeight()); pSwing.localToGlobal(r1c); canvas.getCamera().globalToLocal(r1c); r1c = canvas.getCamera().getViewTransform().createTransformedShape(r1c).getBounds2D(); diff --git a/extras/src/test/java/edu/umd/cs/piccolox/pswing/TestPSwing.java b/extras/src/test/java/edu/umd/cs/piccolox/pswing/TestPSwing.java index f851d34..8ecfb89 100644 --- a/extras/src/test/java/edu/umd/cs/piccolox/pswing/TestPSwing.java +++ b/extras/src/test/java/edu/umd/cs/piccolox/pswing/TestPSwing.java @@ -154,10 +154,14 @@ root.translate(300, 200); pCanvas.getLayer().addChild(root); + // A Combo Box + JPanel comboPanel = new JPanel(); + comboPanel.setBorder( BorderFactory.createTitledBorder( "Combo Box" ) ); String[] listItems = { "Summer Teeth", "Mermaid Avenue", "Being There", "A.M." }; PComboBox box = new PComboBox(listItems); - swing = new PSwing(box); - swing.translate(200, 250); + comboPanel.add(box); + swing = new PSwing(comboPanel); + swing.translate( 200, 230 ); pCanvas.getLayer().addChild(swing); box.setEnvironment(swing, pCanvas);// has to be done manually at present