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

Merge pull request #993 from SiboVG/issue-989

Browse Source 
[fixes #989 & #992] Fix 3D view going blank + high CPU usage
This commit is contained in:
Billy Olsen 2021-08-14 20:26:10 -07:00 committed by GitHub
commit 4d8e4be604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java
View File

@ -5,38 +5,49 @@ import javax.swing.Action;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.Graphics; import java.awt.Graphics;
public class SelectColorButton extends JButton { public class SelectColorButton extends JButton {
public SelectColorButton() { public SelectColorButton() {
addChangeListenerSelectColor();
} }
public SelectColorButton(Icon icon) { public SelectColorButton(Icon icon) {
super(icon); super(icon);
addChangeListenerSelectColor();
} }
public SelectColorButton(String text) { public SelectColorButton(String text) {
super(text); super(text);
addChangeListenerSelectColor();
} }
public SelectColorButton(Action a) { public SelectColorButton(Action a) {
super(a); super(a);
addChangeListenerSelectColor();
} }
public SelectColorButton(String text, Icon icon) { public SelectColorButton(String text, Icon icon) {
super(text, icon); super(text, icon);
addChangeListenerSelectColor();
} }
private void addChangeListenerSelectColor() {
if (UIManager.getColor("Button.selectForeground") == null
@Override || UIManager.getColor("Button.foreground") == null)
public void paint(Graphics g) { return;
if (getModel().isArmed()) { addChangeListener(new ChangeListener() {
setForeground(UIManager.getColor("Button.selectForeground")); @Override
} public void stateChanged(ChangeEvent e) {
else { if (getModel().isArmed()) {
setForeground(UIManager.getColor("Button.foreground")); setForeground(UIManager.getColor("Button.selectForeground"));
} }
super.paint(g); else {
setForeground(UIManager.getColor("Button.foreground"));
}
}
});
} }
} }

56
swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java
View File

@ -4,7 +4,8 @@ import javax.swing.JToggleButton;
import javax.swing.Action; import javax.swing.Action;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.UIManager; import javax.swing.UIManager;
import java.awt.Graphics; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
/** /**
* This class is a replacement for the standard JToggleButton. Its purpose is to be able * This class is a replacement for the standard JToggleButton. Its purpose is to be able
@ -15,43 +16,78 @@ import java.awt.Graphics;
public class SelectColorToggleButton extends JToggleButton { public class SelectColorToggleButton extends JToggleButton {
public SelectColorToggleButton(Action a) { public SelectColorToggleButton(Action a) {
super(a); super(a);
addChangeListenerSelectColor();
} }
public SelectColorToggleButton(String text) { public SelectColorToggleButton(String text) {
super(text); super(text);
addChangeListenerSelectColor();
} }
public SelectColorToggleButton() { public SelectColorToggleButton() {
addChangeListenerSelectColor();
} }
public SelectColorToggleButton(Icon icon) { public SelectColorToggleButton(Icon icon) {
super(icon); super(icon);
addChangeListenerSelectColor();
} }
public SelectColorToggleButton(Icon icon, boolean selected) { public SelectColorToggleButton(Icon icon, boolean selected) {
super(icon, selected); super(icon, selected);
addChangeListenerSelectColor();
} }
public SelectColorToggleButton(String text, boolean selected) { public SelectColorToggleButton(String text, boolean selected) {
super(text, selected); super(text, selected);
addChangeListenerSelectColor();
} }
public SelectColorToggleButton(String text, Icon icon) { public SelectColorToggleButton(String text, Icon icon) {
super(text, icon); super(text, icon);
addChangeListenerSelectColor();
} }
public SelectColorToggleButton(String text, Icon icon, boolean selected) { public SelectColorToggleButton(String text, Icon icon, boolean selected) {
super(text, icon, selected); super(text, icon, selected);
addChangeListenerSelectColor();
} }
@Override /**
public void paint(Graphics g) { * This method sets the foreground color of the button. If the button is selected, then the selectForeground is used.
if (isSelected()) { * If the frame that the button is in goes out of focus or if the button is unselected, then the foreground is used.
setForeground(UIManager.getColor("ToggleButton.selectForeground")); *
} * This is to fix an issue on OSX devices where the foreground color would be black on blue (hardly readable)
else { */
setForeground(UIManager.getColor("ToggleButton.foreground")); private void addChangeListenerSelectColor() {
} if (UIManager.getColor("ToggleButton.selectForeground") == null
super.paint(g); || UIManager.getColor("ToggleButton.foreground") == null)
return;
// Case: frame goes out of focus
addPropertyChangeListener("Frame.active", new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (isSelected() && (boolean)evt.getNewValue()) {
setForeground(UIManager.getColor("ToggleButton.selectForeground"));
}
else {
setForeground(UIManager.getColor("ToggleButton.foreground"));
}
}
});
// Case: button is clicked
addPropertyChangeListener("ancestor", new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (isSelected()) {
setForeground(UIManager.getColor("ToggleButton.selectForeground"));
}
else {
setForeground(UIManager.getColor("ToggleButton.foreground"));
}
}
});
} }
} }