add style submenu

DJ-Raven · Mar 23, 2024 · fd4cfd8 · fd4cfd8
1 parent 20679e9
commit fd4cfd8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/jar library/swing-glasspane-popup-1.4.0.jar → jar library/swing-glasspane-popup-1.5.0.jar b/jar library/swing-glasspane-popup-1.4.0.jar → jar library/swing-glasspane-popup-1.5.0.jar
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>raven.popup</groupId>
     <artifactId>swing-glasspane-popup</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/src/main/java/raven/drawer/component/menu/SimpleMenu.java b/src/main/java/raven/drawer/component/menu/SimpleMenu.java
@@ -229,8 +229,12 @@ private void init() {
             setLayout(menuLayout);
             // Use opaque true on the first submenu panel to fix g2d draw arrow line
             setOpaque(menuLevel == 0);
-            putClientProperty(FlatClientProperties.STYLE, "" +
+            if (simpleMenuOption.simpleMenuStyle != null) {
+                simpleMenuOption.simpleMenuStyle.styleMenuPanel(this, copyArray(this.index));
+            }
+            FlatLafStyleUtils.appendStyleIfAbsent(FlatClientProperties.STYLE, "" +
                     "background:null");
+
             iconWidth = 22;
             int index = 0;
             int validationIndex = -1;

diff --git a/src/main/java/raven/drawer/component/menu/SimpleMenuStyle.java b/src/main/java/raven/drawer/component/menu/SimpleMenuStyle.java
@@ -7,6 +7,9 @@ public abstract class SimpleMenuStyle {
     public void styleMenu(JComponent component) {
     }
 
+    public void styleMenuPanel(JPanel panel, int[] index) {
+    }
+
     public void styleMenuItem(JButton menu, int[] index) {
     }
 

diff --git a/src/test/java/test/MyDrawerBuilder.java b/src/test/java/test/MyDrawerBuilder.java
@@ -138,8 +138,14 @@ public void selected(MenuAction action, int[] index) {
             }
         });
         simpleMenuOption.setMenuStyle(new SimpleMenuStyle() {
+            @Override
+            public void styleMenuPanel(JPanel panel, int[] index) {
+                // style submenu panel here
+            }
+
             @Override
             public void styleMenuItem(JButton menu, int[] index) {
+                menu.setContentAreaFilled(false);
                 menu.putClientProperty(FlatClientProperties.STYLE, "" +
                         "[light]foreground:#FAFAFA;" +
                         "arc:0");