MenuItems: borders and icons added

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.geom.Path2D;
+import javax.swing.AbstractButton;
+import javax.swing.UIManager;
+
+/**
+ * Icon for {@link javax.swing.JCheckBoxMenuItem}.
+ *
+ * @uiDefault MenuItemCheckBox.icon.checkmarkColor				Color
+ * @uiDefault MenuItemCheckBox.icon.disabledCheckmarkColor		Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatCheckBoxMenuItemIcon
+	extends FlatAbstractIcon
+{
+	protected final Color checkmarkColor = UIManager.getColor( "MenuItemCheckBox.icon.checkmarkColor" );
+	protected final Color disabledCheckmarkColor = UIManager.getColor( "MenuItemCheckBox.icon.disabledCheckmarkColor" );
+
+	public FlatCheckBoxMenuItemIcon() {
+		super( 15, 15, null );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g2 ) {
+		boolean selected = (c instanceof AbstractButton) && ((AbstractButton)c).isSelected();
+
+		// paint checkmark
+		if( selected ) {
+			g2.setColor( c.isEnabled() ? checkmarkColor : disabledCheckmarkColor );
+			paintCheckmark( g2 );
+		}
+	}
+
+	protected void paintCheckmark( Graphics2D g2 ) {
+		Path2D.Float path = new Path2D.Float();
+		path.moveTo( 4.5f, 7.5f );
+		path.lineTo( 6.6f, 10f );
+		path.lineTo( 11.25f, 3.5f );
+
+		g2.setStroke( new BasicStroke( 1.9f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND ) );
+		g2.draw( path );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.geom.Path2D;
+import javax.swing.UIManager;
+
+/**
+ * "arrow" icon for {@link javax.swing.JMenu}.
+ *
+ * @uiDefault Menu.icon.arrowColor				Color
+ * @uiDefault Menu.icon.disabledArrowColor		Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatMenuArrowIcon
+	extends FlatAbstractIcon
+{
+	protected final Color checkmarkColor = UIManager.getColor( "Menu.icon.arrowColor" );
+	protected final Color disabledCheckmarkColor = UIManager.getColor( "Menu.icon.disabledArrowColor" );
+
+	public FlatMenuArrowIcon() {
+		super( 5, 10, null );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		Path2D arrow = new Path2D.Float();
+		arrow.moveTo( 0, 0.5 );
+		arrow.lineTo( 0, 9.5 );
+		arrow.lineTo( 5, 5 );
+		arrow.closePath();
+
+		if( !c.getComponentOrientation().isLeftToRight() )
+			g.rotate( Math.toRadians( 180 ), width / 2., height / 2. );
+
+		g.setColor( c.isEnabled() ? checkmarkColor : disabledCheckmarkColor );
+		g.fill( arrow );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuItemArrowIcon.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+/**
+ * "arrow" icon for {@link javax.swing.JMenuItem}.
+ *
+ * @author Karl Tauber
+ */
+public class FlatMenuItemArrowIcon
+	extends FlatMenuArrowIcon
+{
+	public FlatMenuItemArrowIcon() {
+	}
+
+	@Override
+	public void paintIcon( Component c, Graphics g, int x, int y ) {
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatRadioButtonMenuItemIcon.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Graphics2D;
+
+/**
+ * Icon for {@link javax.swing.JRadioButtonMenuItem}.
+ *
+ * @author Karl Tauber
+ */
+public class FlatRadioButtonMenuItemIcon
+	extends FlatCheckBoxMenuItemIcon
+{
+	@Override
+	protected void paintCheckmark( Graphics2D g2 ) {
+		g2.fillOval( 4, 4, 7, 7 );
+	}
+}

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties

@@ -102,6 +102,18 @@ Component.focusedBorderColor=466d94
 Component.focusColor=3d6185
 
 
+#---- Menu ----
+
+Menu.icon.arrowColor=A7A7A7
+Menu.icon.disabledArrowColor=606060
+
+
+#---- MenuItemCheckBox ----
+
+MenuItemCheckBox.icon.checkmarkColor=A7A7A7
+MenuItemCheckBox.icon.disabledCheckmarkColor=606060
+
+
 #---- ProgressBar ----
 
 ProgressBar.background=555555

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties

@@ -54,6 +54,13 @@ CheckBox.border=com.formdev.flatlaf.ui.FlatMarginBorder
 CheckBox.icon=com.formdev.flatlaf.icons.FlatCheckBoxIcon
 
 
+#---- CheckBoxMenuItem ----
+
+CheckBoxMenuItem.border=com.formdev.flatlaf.ui.FlatMarginBorder
+CheckBoxMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon
+CheckBoxMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
+
+
 #---- ComboBox ----
 
 ComboBox.border=com.formdev.flatlaf.ui.FlatRoundBorder
@@ -87,6 +94,18 @@ List.focusCellHighlightBorder=1,6,1,6,@selectionBackground
 List.focusSelectedCellHighlightBorder=1,6,1,6,@selectionBackground
 
 
+#---- Menu ----
+
+Menu.border=com.formdev.flatlaf.ui.FlatMarginBorder
+Menu.arrowIcon=com.formdev.flatlaf.icons.FlatMenuArrowIcon
+
+
+#---- MenuItem ----
+
+MenuItem.border=com.formdev.flatlaf.ui.FlatMarginBorder
+MenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
+
+
 #---- PasswordField ----
 
 PasswordField.border=com.formdev.flatlaf.ui.FlatBorder
@@ -107,6 +126,13 @@ RadioButton.border=com.formdev.flatlaf.ui.FlatMarginBorder
 RadioButton.icon=com.formdev.flatlaf.icons.FlatRadioButtonIcon
 
 
+#---- RadioButtonMenuItem ----
+
+RadioButtonMenuItem.border=com.formdev.flatlaf.ui.FlatMarginBorder
+RadioButtonMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon
+RadioButtonMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
+
+
 #---- ScrollBar ----
 
 ScrollBar.width=10

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties

@@ -102,6 +102,18 @@ Component.focusedBorderColor=87afda
 Component.focusColor=97c3f3
 
 
+#---- Menu ----
+
+Menu.icon.arrowColor=666666
+Menu.icon.disabledArrowColor=ABABAB
+
+
+#---- MenuItemCheckBox ----
+
+MenuItemCheckBox.icon.checkmarkColor=4D89C9
+MenuItemCheckBox.icon.disabledCheckmarkColor=ABABAB
+
+
 #---- ProgressBar ----
 
 ProgressBar.background=c4c4c4