Repository: cayenne Updated Branches: refs/heads/STABLE-4.0 f437509e2 -> df4fa17ed
Modeler: fix ComboBox style Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/df4fa17e Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/df4fa17e Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/df4fa17e Branch: refs/heads/STABLE-4.0 Commit: df4fa17ed888446502b121b1c527d698d27549dc Parents: f437509 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Mar 28 14:28:56 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Mar 28 14:28:56 2018 +0300 ---------------------------------------------------------------------- .../modeler/osx/OSXPlatformInitializer.java | 31 +++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/df4fa17e/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java index eee5c26..62d0a35 100644 --- a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java +++ b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java @@ -87,21 +87,24 @@ public class OSXPlatformInitializer implements PlatformInitializer { final Color darkGrey = new Color(225, 225, 225); Border darkBorder = BorderFactory.createLineBorder(darkGrey); - UIManager.put("ToolBarSeparatorUI", OSXToolBarSeparatorUI.class.getName()); - UIManager.put("PanelUI", OSXPanelUI.class.getName()); + UIManager.put("ToolBarSeparatorUI", OSXToolBarSeparatorUI.class.getName()); + UIManager.put("PanelUI", OSXPanelUI.class.getName()); // next two is custom made for Cayenne's MainToolBar - UIManager.put("MainToolBar.background", UIManager.get("ToolBar.background")); - UIManager.put("MainToolBar.border", BorderFactory.createEmptyBorder(0, 7, 0, 7)); - UIManager.put("ToolBar.background", lightGrey); - UIManager.put("ToolBar.border", darkBorder); - UIManager.put("ScrollPane.border", darkBorder); - UIManager.put("Table.scrollPaneBorder", darkBorder); - UIManager.put("SplitPane.border", BorderFactory.createEmptyBorder()); - UIManager.put("SplitPane.background", darkGrey); - UIManager.put("Tree.rendererFillBackground", Boolean.TRUE); - UIManager.put("Tree.selectionForeground", Color.BLACK); - UIManager.put("Tree.selectionBackground", lightGrey); - UIManager.put("Tree.selectionBorderColor", lightGrey); + UIManager.put("MainToolBar.background", UIManager.get("ToolBar.background")); + UIManager.put("MainToolBar.border", BorderFactory.createEmptyBorder(0, 7, 0, 7)); + UIManager.put("ToolBar.background", lightGrey); + UIManager.put("ToolBar.border", darkBorder); + UIManager.put("ScrollPane.border", darkBorder); + UIManager.put("Table.scrollPaneBorder", darkBorder); + UIManager.put("SplitPane.border", BorderFactory.createEmptyBorder()); + UIManager.put("SplitPane.background", darkGrey); + UIManager.put("ComboBox.background", Color.WHITE); + UIManager.put("ComboBox.selectionBackground", darkGrey); + UIManager.put("ComboBox.selectionForeground", Color.BLACK); + UIManager.put("Tree.rendererFillBackground", Boolean.TRUE); + UIManager.put("Tree.selectionForeground", Color.BLACK); + UIManager.put("Tree.selectionBackground", lightGrey); + UIManager.put("Tree.selectionBorderColor", lightGrey); Border backgroundPainter = new AbstractBorder() { @Override
