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/13 14:53:18 UTC

[cayenne] branch STABLE-4.2 updated (ecf05ef71 -> 85e70e316)

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a change to branch STABLE-4.2
in repository https://gitbox.apache.org/repos/asf/cayenne.git


    from ecf05ef71 CAY-2755 Modeler: Entities are not sorted by name in the class generation view
     new cbbd65274 CAY-2762 Modeler: fix toolbars diff color
     new 85e70e316 CAY-2762 Modeler: Difference in toolbars colors on OSX  - release notes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 RELEASE-NOTES.txt                                                     | 2 +-
 .../java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


[cayenne] 01/02: CAY-2762 Modeler: fix toolbars diff color

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.2
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit cbbd65274b3558e3dfde4b1687d3847835057bcd
Author: ivannikitka <ni...@gmail.com>
AuthorDate: Tue Oct 11 18:10:43 2022 +0200

    CAY-2762 Modeler: fix toolbars diff color
    
    (cherry picked from commit 3047b6cfc66b6a9ea7f30a5ad88b6147e7f4d71c)
---
 .../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 6651e96d6..7fae8601f 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
@@ -79,9 +79,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);


[cayenne] 02/02: CAY-2762 Modeler: Difference in toolbars colors on OSX - release notes

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.2
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 85e70e3166bee817ef730cf9145a658551c6eee8
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Oct 13 17:53:07 2022 +0300

    CAY-2762 Modeler: Difference in toolbars colors on OSX
     - release notes
---
 RELEASE-NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e81cf900f..1b9147a5e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -21,7 +21,7 @@ CAY-2750 Deprecate web module
 Bug Fixes:
 
 CAY-2755 Modeler: Entities are not sorted by name in the class generation view
-
+CAY-2762 Modeler: Difference in toolbars colors on OSX
 
 ----------------------------------
 Release: 4.2.RC1