hoi
This commit is contained in:
xrgman
2015-04-08 14:03:58 +02:00
parent 98af73b15e
commit 7c28dd3a16
29 changed files with 824 additions and 174 deletions
+13 -3
View File
@@ -56,6 +56,7 @@ public class PropertiesPanel extends JPanel
setPreferredSize(new Dimension(200, 0));
setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
setBackground(new Color(220, 220, 220));
setFocusable(false);
// NAME "PROPERTIES"
JPanel propPanel = new JPanel();
@@ -97,6 +98,7 @@ public class PropertiesPanel extends JPanel
// BUTTONS ROW 1
JPanel row1ButtonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
JButton deleteButton = new JButton("Delete");
deleteButton.setFocusable(false);
deleteButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
deleteButton.addActionListener(new ActionListener()
{
@@ -111,6 +113,7 @@ public class PropertiesPanel extends JPanel
}
});
JButton areaButton = new JButton("Area");
areaButton.setFocusable(false);
areaButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
areaButton.addActionListener(new ActionListener()
{
@@ -330,7 +333,8 @@ public class PropertiesPanel extends JPanel
{
locationXField.setBackground(Color.WHITE);
double xpos = Double.parseDouble(locationXField.getText());
selectedObject.setPosition(new Point2D.Double(xpos, selectedObject.getPosition().getY()));
selectedObject.setPosition(new Point2D.Double(xpos, selectedObject.getPosition().getY()), true);
update();
p.update();
}
catch (NumberFormatException nfe)
@@ -369,8 +373,8 @@ public class PropertiesPanel extends JPanel
{
locationYField.setBackground(Color.WHITE);
double ypos = Double.parseDouble(locationYField.getText());
selectedObject.setPosition(new Point2D.Double(selectedObject.getPosition().getX(), ypos));
;
selectedObject.setPosition(new Point2D.Double(selectedObject.getPosition().getX(), ypos), true);
update();
p.update();
}
catch (NumberFormatException nfe)
@@ -420,7 +424,13 @@ public class PropertiesPanel extends JPanel
{
scaleField.setBackground(Color.WHITE);
double scale = Double.parseDouble(scaleField.getText());
if(scale<0 || (scale >0 && scale<0.2))
{
scale=0.2;
scaleField.setText(scale+"");
}
selectedObject.setScale(scale);
p.update();
}
catch (NumberFormatException nfe)