githubliufuwen
diff --git a/‎.idea/workspace.xml
Lines changed: 45 additions & 51 deletions b/‎.idea/workspace.xml
Lines changed: 45 additions & 51 deletions
diff --git a/‎src/main/java/MaterialUISwingDemo.java
Lines changed: 9 additions & 9 deletions b/‎src/main/java/MaterialUISwingDemo.java
Lines changed: 9 additions & 9 deletions
diff --git a/‎src/main/java/mdlaf/MaterialLookAndFeel.java
Lines changed: 1 addition & 1 deletion b/‎src/main/java/mdlaf/MaterialLookAndFeel.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/mdlaf/components/button/MaterialButtonUI.java
Lines changed: 5 additions & 1 deletion b/‎src/main/java/mdlaf/components/button/MaterialButtonUI.java
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/main/java/mdlaf/utils/MaterialImages.java
Lines changed: 1 addition & 0 deletions b/‎src/main/java/mdlaf/utils/MaterialImages.java
Lines changed: 1 addition & 0 deletions
diff --git a/‎target/classes/imgs/test.png
5.23 KB b/‎target/classes/imgs/test.png
5.23 KB
diff --git a/‎target/classes/material-ui-swing.jar
5.43 KB b/‎target/classes/material-ui-swing.jar
5.43 KB
@@ -1,9 +1,11 @@
 import mdlaf.MaterialLookAndFeel;
 import mdlaf.animation.MaterialUIMovement;
 import mdlaf.utils.MaterialColors;
+import mdlaf.utils.MaterialImages;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
@@ -103,7 +105,7 @@ public static void main (String[] args) {
 		// the animation will take 5 * 1000 / 30 = 166.666... milliseconds to complete
 		MaterialUIMovement.add (button, MaterialColors.LIGHT_BLUE_500, 5, 1000 / 30);
 
-		//
+		// other components
 		content.add (new JCheckBox ("checkbox"));
 		content.add (new JComboBox<String> (new String[]{"a", "b", "c"}));
 		content.add (new JLabel ("label"));
@@ -117,15 +119,13 @@ public static void main (String[] args) {
 
 		JToolBar tb = new JToolBar ("toolbar");
 		JButton button1 = new JButton ("f");
-		class ActionTest extends AbstractAction {
 
-			public ActionTest () {
+		button1.setAction (new AbstractAction () {
+			@Override
+			public void actionPerformed (ActionEvent e) {
 				putValue (Action.NAME, "f");
 				putValue (Action.SHORT_DESCRIPTION, "Test tool tip");
-			}
 
-			@Override
-			public void actionPerformed (ActionEvent e) {
 				JDialog dialog = new JDialog ();
 				JPanel jPanel = new JPanel ();
 				jPanel.add (new JColorChooser ());
@@ -134,8 +134,8 @@ public void actionPerformed (ActionEvent e) {
 				dialog.setVisible (true);
 				dialog.pack ();
 			}
-		}
-		button1.setAction (new ActionTest ());
+		});
+
 		JButton button2 = new JButton ("e");
 		button1.setBackground (MaterialColors.LIGHT_BLUE_400);
 		button1.setForeground (Color.WHITE);
@@ -158,8 +158,8 @@ public void actionPerformed (ActionEvent e) {
 
 		JPanel pn = new JPanel ();
 		JTabbedPane tp = new JTabbedPane ();
-		tp.addTab ("bleh1", pn);
 		tp.addTab ("bleh", sp);
+		tp.addTab ("bleh2", pn);
 
 		frame.add (tp, BorderLayout.CENTER);
 
 
@@ -136,7 +136,7 @@ protected void initComponentDefaults (UIDefaults table) {
 		super.initComponentDefaults (table);
 
 		table.put ("Button.highlight", MaterialColors.GRAY_200);
-		table.put ("Button.opaque", false);
+		table.put ("Button.opaque", true);
 		table.put ("Button.border", BorderFactory.createEmptyBorder (7, 17, 7, 17));
 		table.put ("Button.background", MaterialColors.WHITE);
 		table.put ("Button.foreground", Color.BLACK);
 
@@ -31,7 +31,11 @@ public void installUI (JComponent c) {
 	public void paint (Graphics g, JComponent c) {
 		AbstractButton b = (AbstractButton) c;
 		g = MaterialDrawingUtils.getAliasedGraphics (g);
-		paintBackground (g, b);
+
+		if (b.isContentAreaFilled ()) {
+			paintBackground (g, b);
+		}
+
 		super.paint (g, c);
 	}
 
 
@@ -27,6 +27,7 @@ public class MaterialImages {
 	public static final BufferedImage LIST = loadImg ("/imgs/list.png");
 	public static final BufferedImage NEW_FOLDER = loadImg ("/imgs/new_folder.png");
 	public static final BufferedImage DETAILS = loadImg ("/imgs/details.png");
+	public static final BufferedImage TEST = loadImg ("/imgs/test.png");
 
 	private MaterialImages () {}