hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "Fit" zoom level in the rocket view panel. This broke during the EventListener refactoring from a little while ago.

Browse Source
This commit is contained in:
Kevin Ruland 2011-12-21 18:22:08 +00:00
parent 1b309dd786
commit ce54de1039
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java
View File

@ -13,6 +13,7 @@ import java.awt.event.ComponentEvent;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener; import java.awt.event.MouseMotionListener;
import java.util.EventObject;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JComponent; import javax.swing.JComponent;
@ -29,6 +30,7 @@ import net.sf.openrocket.unit.Tick;
import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.StateChangeListener;
@ -117,9 +119,9 @@ public class ScaleScrollPane extends JScrollPane
viewport.addMouseListener(this); viewport.addMouseListener(this);
viewport.addMouseMotionListener(this); viewport.addMouseMotionListener(this);
figure.addChangeListener(new ChangeListener() { figure.addChangeListener(new StateChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(EventObject e) {
horizontalRuler.updateSize(); horizontalRuler.updateSize();
verticalRuler.updateSize(); verticalRuler.updateSize();
if (fit) { if (fit) {

8
src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java
View File

@ -4,15 +4,15 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.EventObject;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.gui.util.Icons;
import net.sf.openrocket.util.StateChangeListener;
public class ScaleSelector extends JPanel { public class ScaleSelector extends JPanel {
@ -85,9 +85,9 @@ public class ScaleSelector extends JPanel {
} }
} }
}); });
scrollPane.getFigure().addChangeListener(new ChangeListener() { scrollPane.getFigure().addChangeListener(new StateChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(EventObject e) {
setZoomText(); setZoomText();
} }
}); });