dominik.rieder 7 éve
szülő
commit
4d3620f898

+ 4 - 1
src/ui/controller/SimulationManager.java

@@ -595,7 +595,10 @@ public class SimulationManager {
 
 	public void setFlexiblePane(FlexiblePane fp) {
 		flexPane = fp;
-		
+	}
+	
+	public FlexiblePane getFlexiblePane(){
+		return flexPane;
 	}
 
 }

+ 9 - 7
src/ui/view/FlexiblePane.java

@@ -23,6 +23,12 @@ public class FlexiblePane extends JScrollPane {
 		flexPanel = new JPanel();
 		flexPanel.setLayout(new BoxLayout(flexPanel, BoxLayout.Y_AXIS));
 		setViewportView(flexPanel);
+		class ResizeListener extends ComponentAdapter{
+			public void componentResized(ComponentEvent e){
+				flexPanel.requestFocusInWindow();
+			}
+		}
+		this.addComponentListener(new ResizeListener());
 	}
 	
 	public void recalculate(){
@@ -66,13 +72,9 @@ public class FlexiblePane extends JScrollPane {
 			((FlexibleData)flexPanel.getComponent(0)).setCons(gridCons);
 			((FlexibleData)flexPanel.getComponent(0)).setProdConsVal(gridProd, gridCons);
 		}
-		
-		class ResizeListener extends ComponentAdapter{
-			public void componentResized(ComponentEvent e){
-				flexPanel.requestFocusInWindow();
-			}
-		}
-		this.addComponentListener(new ResizeListener());
+		flexPanel.revalidate();
+		flexPanel.repaint();
+		flexPanel.updateUI();
 	}
 	
 	public JPanel getPanel(){

+ 1 - 1
src/ui/view/GUI.java

@@ -655,7 +655,7 @@ public class GUI<E> implements CategoryListener {
 		mntmEditShowedInformation.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				try {
-					ShowedInformationPopUp dialog = new ShowedInformationPopUp(canvas, contentPane);
+					ShowedInformationPopUp dialog = new ShowedInformationPopUp(canvas, contentPane, controller);
 					dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 					dialog.setVisible(true);
 				} catch (Exception ex) {

+ 7 - 2
src/ui/view/ShowedInformationPopUp.java

@@ -10,6 +10,8 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
 
+import ui.controller.Control;
+
 /**
  * This Class represents a Popup to edit the shown Information.
  * 
@@ -21,6 +23,7 @@ public class ShowedInformationPopUp extends JDialog {
 	private final JPanel contentPanel = new JPanel();
 	private final JButton btnOk = new JButton("OK");
 	private MyCanvas canvas;
+	private Control controller;
 	private JCheckBox objectEnergyCheckbox;
 	private JCheckBox connectionCheckbox;
 	private JCheckBox colorizedBorderCheckbox;
@@ -33,17 +36,18 @@ public class ShowedInformationPopUp extends JDialog {
 	 * @param canvas
 	 *            the Canvas
 	 */
-	public ShowedInformationPopUp(MyCanvas canvas, JPanel update) {
+	public ShowedInformationPopUp(MyCanvas canvas, JPanel update, Control cont) {
 		super((java.awt.Frame) null, true);
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);
 		this.setTitle(Languages.getLanguage()[31]);
-		setBounds(100, 100, 400, 254);
+		setBounds(100, 100, 400, 276);
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel, BorderLayout.CENTER);
 		contentPanel.setLayout(null);
 		this.canvas = canvas;
 		this.toUpdate = update;
+		controller = cont;
 
 		objectEnergyCheckbox = new JCheckBox(Languages.getLanguage()[32]);
 		objectEnergyCheckbox.setBounds(19, 19, 300, 23);
@@ -59,6 +63,7 @@ public class ShowedInformationPopUp extends JDialog {
 			public void actionPerformed(ActionEvent arg0) {
 				setInformation(connectionCheckbox.isSelected(), objectEnergyCheckbox.isSelected(),
 						colorizedBorderCheckbox.isSelected(), nodeOfnodeConnectionCheckbox.isSelected());
+				controller.getSimManager().getFlexiblePane().recalculate();
 				dispose();
 			}
 		});