Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-25 13:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz 2023-06-09 08:54:00 -04:00
commit 8e9a5b39cc
2 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/Gui/src/main/java/generic/theme/builtin/MacTheme.java
View File

@ -27,6 +27,6 @@ import generic.theme.LafType;
public class MacTheme extends DiscoverableGTheme {
public MacTheme() {
super("Mac OS X Theme", LafType.MAC);
super("Mac Theme", LafType.MAC);
}
}

84
Ghidra/Framework/Gui/src/main/java/generic/theme/laf/MacLookAndFeelManager.java
View File

@ -15,11 +15,18 @@
*/
package generic.theme.laf;
import java.awt.*;
import javax.swing.BorderFactory;
import javax.swing.UIDefaults;
import javax.swing.border.EmptyBorder;
import generic.theme.ApplicationThemeManager;
import generic.theme.LafType;
import generic.theme.*;
/**
* Manages installing and updating the Mac Aqua look and feel. This is where we make look and
* feel changes specific to the Mac Aqua look and feel, so that it works with the theming feature.
*/
public class MacLookAndFeelManager extends LookAndFeelManager {
public MacLookAndFeelManager(ApplicationThemeManager themeManager) {
@ -28,6 +35,77 @@ public class MacLookAndFeelManager extends LookAndFeelManager {
@Override
protected UiDefaultsMapper getUiDefaultsMapper(UIDefaults defaults) {
return new UiDefaultsMapper(defaults);
return new MacUiDefaultsMapper(defaults);
}
private static class MacUiDefaultsMapper extends UiDefaultsMapper {
protected MacUiDefaultsMapper(UIDefaults defaults) {
super(defaults);
}
/**
* Fix incorrectly defined default color values. These colors were not used before, but
* they are now that we override the Mac Aqua Look and Feel painters.
* @return the extracted resource properties from the Mac Aqua Look and Feel with overridden
* values for the menu selection colors
*/
@Override
protected GThemeValueMap extractColorFontAndIconValuesFromDefaults() {
// This is the default menu selection color used by Mac Aqua Look and Feel menu
// painters. This color is different than the color defined in the UI manager. To
// keep the colors consistent with the default behavior, we need to override the value
// in the UI manager with this color.
Color menuSelectionColor = new Color(0, 103, 214);
GThemeValueMap map = super.extractColorFontAndIconValuesFromDefaults();
map.addColor(new ColorValue("Menu.selectionBackground", menuSelectionColor));
map.addColor(new ColorValue("MenuBar.selectionBackground", menuSelectionColor));
map.addColor(new ColorValue("MenuItem.selectionBackground", menuSelectionColor));
map.addColor(new ColorValue("PopupMenu.selectionBackground", menuSelectionColor));
map.addColor(new ColorValue("ComboBox.selectionBackground", menuSelectionColor));
map.addColor(
new ColorValue("RadioButtonMenuItem.selectionBackground", menuSelectionColor));
map.addColor(
new ColorValue("CheckBoxMenuItem.selectionBackground", menuSelectionColor));
return map;
}
/**
* Overridden to change the Mac menu painters. The default painters do not honor
* the color values set by the Look and Feel. We override the painters by using
* either a Java border or our own painters that will use the theme colors.
* @param currentValues the values to install into the LookAndFeel UiDefaults map
*/
@Override
public void installValuesIntoUIDefaults(GThemeValueMap currentValues) {
super.installValuesIntoUIDefaults(currentValues);
defaults.put("MenuBar.backgroundPainter", BorderFactory.createEmptyBorder());
defaults.put("MenuBar.selectedBackgroundPainter",
new BackgroundBorder(new GColor("laf.color.MenuBar.selectionBackground")));
defaults.put("MenuItem.selectedBackgroundPainter",
new BackgroundBorder(new GColor("laf.color.MenuItem.selectionBackground")));
}
}
/**
* Background painter for selected menu items.
*/
private static class BackgroundBorder extends EmptyBorder {
private GColor selectedMenuBacgroundColor;
public BackgroundBorder(GColor color) {
super(0, 0, 0, 0);
this.selectedMenuBacgroundColor = color;
}
public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
g.setColor(selectedMenuBacgroundColor);
g.fillRect(x, y, width, height);
}
}
}