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

Merge pull request #984 from SiboVG/issue-948

Browse Source
This commit is contained in:
Billy Olsen 2021-07-17 11:32:29 -07:00 committed by GitHub
commit 0db65d6884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swing/src/net/sf/openrocket/gui/util/GUIUtil.java
View File

@ -1,14 +1,6 @@
package net.sf.openrocket.gui.util; package net.sf.openrocket.gui.util;
import java.awt.Component; import java.awt.*;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Image;
import java.awt.KeyboardFocusManager;
import java.awt.Point;
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.ComponentAdapter; import java.awt.event.ComponentAdapter;

10
swing/src/net/sf/openrocket/startup/OSXSetup.java
View File

@ -1,9 +1,6 @@
package net.sf.openrocket.startup; package net.sf.openrocket.startup;
import java.awt.Desktop; import java.awt.*;
import java.awt.Image;
import java.awt.Taskbar;
import java.awt.Toolkit;
import java.awt.desktop.AboutHandler; import java.awt.desktop.AboutHandler;
import java.awt.desktop.PreferencesHandler; import java.awt.desktop.PreferencesHandler;
import java.awt.desktop.QuitHandler; import java.awt.desktop.QuitHandler;
@ -17,6 +14,8 @@ import net.sf.openrocket.gui.dialogs.AboutDialog;
import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog; import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog;
import net.sf.openrocket.gui.main.BasicFrame; import net.sf.openrocket.gui.main.BasicFrame;
import javax.swing.*;
/** /**
* Static code for initialization of OSX UI Elements: Menu, Icon, Name and * Static code for initialization of OSX UI Elements: Menu, Icon, Name and
* Application menu handlers. * Application menu handlers.
@ -91,6 +90,9 @@ final class OSXSetup {
final Taskbar osxTaskbar = Taskbar.getTaskbar(); final Taskbar osxTaskbar = Taskbar.getTaskbar();
osxTaskbar.setIconImage(dockIcon); osxTaskbar.setIconImage(dockIcon);
// Set the foreground of active tabs to black; there was a bug where you had a white background and white foreground
UIManager.put("TabbedPane.foreground", Color.black);
} catch (final Throwable t) { } catch (final Throwable t) {
// None of the preceding is critical to the app, // None of the preceding is critical to the app,
// so at worst case log an error and continue // so at worst case log an error and continue