You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/10/12 14:55:03 UTC
[cayenne] branch master updated: CAY-2762 Modeler: fix toolbars diff color
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 3047b6cfc CAY-2762 Modeler: fix toolbars diff color
new ac7973a41 Merge pull request #525 from Ivan-nikitko/bug_with_color_in_toolBar
3047b6cfc is described below
commit 3047b6cfc66b6a9ea7f30a5ad88b6147e7f4d71c
Author: ivannikitka <ni...@gmail.com>
AuthorDate: Tue Oct 11 18:10:43 2022 +0200
CAY-2762 Modeler: fix toolbars diff color
---
.../java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 0ee1cc110..378ab8b6e 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
@@ -74,9 +74,9 @@ public class OSXPlatformInitializer implements PlatformInitializer {
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("MainToolBar.background", lightGrey);
+ UIManager.put("MainToolBar.border", BorderFactory.createEmptyBorder(0, 7, 0, 7));
UIManager.put("ToolBar.border", darkBorder);
UIManager.put("ScrollPane.border", darkBorder);
UIManager.put("Table.scrollPaneBorder", darkBorder);