From 94f9e4a1be68b76980e9a49b4120916397999a01 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Wed, 3 Aug 2022 13:16:43 +0200
Subject: [PATCH] fixed missing UI value `MenuItem.acceleratorDelimiter` on
 macOS (was `null`, is now an empty string)

---
 CHANGELOG.md                                              | 8 ++++++++
 .../main/resources/com/formdev/flatlaf/FlatLaf.properties | 4 ++--
 .../dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt            | 2 +-
 .../dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt           | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f38de045..95f0b646 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 FlatLaf Change Log
 ==================
 
+## 2.5-SNAPSHOT
+
+#### Fixed bugs
+
+- Fixed missing UI value `MenuItem.acceleratorDelimiter` on macOS. (was `null`,
+  is now an empty string)
+
+
 ## 2.4
 
 #### New features and improvements
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
index 5d24952f..2c50af92 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -442,8 +442,8 @@ MenuItem.iconTextGap = 6
 MenuItem.textAcceleratorGap = 24
 MenuItem.textNoAcceleratorGap = 6
 MenuItem.acceleratorArrowGap = 2
-MenuItem.acceleratorDelimiter = +
-[mac]MenuItem.acceleratorDelimiter = 
+MenuItem.acceleratorDelimiter = "+"
+[mac]MenuItem.acceleratorDelimiter = ""
 
 # for MenuItem.selectionType = underline
 MenuItem.underlineSelectionBackground = @menuHoverBackground
diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt
index 9f711d9b..b74ba588 100644
--- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt
+++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt
@@ -25,7 +25,7 @@
 
 #---- MenuItem ----
 
-- MenuItem.acceleratorDelimiter  -
+- MenuItem.acceleratorDelimiter  +
 + MenuItem.acceleratorDelimiter  
 
 
diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt
index 9f711d9b..b74ba588 100644
--- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt
+++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt
@@ -25,7 +25,7 @@
 
 #---- MenuItem ----
 
-- MenuItem.acceleratorDelimiter  -
+- MenuItem.acceleratorDelimiter  +
 + MenuItem.acceleratorDelimiter