ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-05 18:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Turned on look and feel for tv (#1861)

Browse Source 
* Turned on look and feel option for tv

Turned on look and feel option for tv

* Removed one import added by accident

Removed one import added by accident
This commit is contained in:
Hong Chen 2025-03-25 14:44:46 -05:00 committed by GitHub
parent 3cc4441f6a
commit aa2e108ea1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trick_source/java/src/main/java/trick/common/RunTimeTrickApplication.java
View File

@ -464,11 +464,6 @@ public abstract class RunTimeTrickApplication extends TrickApplication {
JMenuBar menuBar = super.createMenuBar();
JMenu menu = menuBar.getMenu(0);
// Remove look and feel menu item.
for (int i = 0; i < 2; ++i) {
menu.remove(0);
}
menu.add(new JSeparator(), 0);
menu.add(new JMenuItem(new AbstractAction("Settings") {

9
trick_source/java/src/main/java/trick/common/TrickApplication.java
View File

@ -10,6 +10,7 @@ import java.awt.Desktop;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@ -274,7 +275,13 @@ public abstract class TrickApplication extends SingleFrameApplication implements
public void run() {
try {
UIManager.setLookAndFeel(finalLafClassName);
SwingUtilities.updateComponentTreeUI(getMainFrame());
// update the UI for all windows with the new look and feel
// this is needed for all the windows that are not
// children of the main frame as well as the children
// of the main frame
for (Window window : Window.getWindows()) {
SwingUtilities.updateComponentTreeUI(window);
}
} catch (Exception exception) {
JOptionPane.showMessageDialog(getMainFrame(),
"Can't change look and feel",

22
trick_source/java/src/main/java/trick/tv/TVApplication.java
View File

@ -405,7 +405,12 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
// Initialze the variable tree.
variableTree = new TVVariableTree() {{
setEnabled(false);
// don't disable it here due to a known issue with the Apple Aqua Look and Feel
// when using custom Look and Feel components on Mac. The NullPointerException
// occurs in the AquaMenuPainter class when it tries to paint a border but
// gets a null value from com.apple.laf.AquaMenuPainter$RecyclableBorder.get()
// returns null
// setEnabled(false);
try {
setSorting(Enum.valueOf(Sorting.class, trickProperties.getProperty(
@ -440,7 +445,14 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
searchPanel = new SearchPanel() {{
setVisible(Boolean.parseBoolean(trickProperties.getProperty(
searchPanelVisibleKey, Boolean.toString(true))));
setEnabled(false);
// don't disable it here due to a known issue with the Apple Aqua Look and Feel
// when using custom Look and Feel components on Mac. The NullPointerException
// occurs in the AquaMenuPainter class when it tries to paint a border but
// gets a null value from com.apple.laf.AquaMenuPainter$RecyclableBorder.get()
// returns null
// setEnabled(false);
setFontSize(Float.parseFloat(trickProperties.getProperty(
fontSizeKey, Integer.toString(getFont().getSize()))));
setAction(new AbstractAction("Add") {
@ -1933,12 +1945,6 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
return Sorting.None;
}
@Override
protected void changeLookAndFeel(String lookAndFeelName) {
// Some of TV's elements don't respond well to look and feel changes,
// so I'm not supporting it for now.
}
@Override
protected void shutdown() {
trickProperties.setProperty(positionKey, position.toString());