Changeset 15781 in josm

Timestamp:

2020-01-26T21:06:28+01:00 (4 years ago)

Author:

simon04

Message:

fix #15334 - Use BasicArrowButton in MapFrame

File:

• trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -8 +8 @@
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.GridBagLayout;
 import java.awt.Rectangle;
@@ -27 +26 @@
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
 import javax.swing.InputMap;
 import javax.swing.JButton;
@@ -38 +36 @@
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
+import javax.swing.SwingConstants;
 import javax.swing.border.Border;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
+import javax.swing.plaf.basic.BasicArrowButton;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
 import javax.swing.plaf.basic.BasicSplitPaneUI;
@@ -139 +139 @@
     private final ListAllButtonsAction listAllDialogsAction = new ListAllButtonsAction(allDialogButtons);
     private final ListAllButtonsAction listAllMapModesAction = new ListAllButtonsAction(allMapModeButtons);
-    private final JButton listAllToggleDialogsButton = new JButton(listAllDialogsAction);
-    private final JButton listAllMapModesButton = new JButton(listAllMapModesAction);
-
-    {
-        listAllDialogsAction.setButton(listAllToggleDialogsButton);
-        listAllMapModesAction.setButton(listAllMapModesButton);
-    }
 
     // Toggle dialogs
@@ -521 +514 @@
             toolBarActions.setInheritsPopupMenu(true);
             sideToolBar.add(toolBarActions);
-            listAllMapModesButton.setAlignmentX(0.5f);
-            listAllMapModesButton.setBorder(null);
-            listAllMapModesButton.setFont(listAllMapModesButton.getFont().deriveFont(Font.PLAIN));
-            listAllMapModesButton.setInheritsPopupMenu(true);
-            sideToolBar.add(listAllMapModesButton);
+            sideToolBar.add(listAllMapModesAction.createButton());
         }
 
@@ -537 +526 @@
             toolBarToggle.setInheritsPopupMenu(true);
             sideToolBar.add(toolBarToggle);
-            listAllToggleDialogsButton.setAlignmentX(0.5f);
-            listAllToggleDialogsButton.setBorder(null);
-            listAllToggleDialogsButton.setFont(listAllToggleDialogsButton.getFont().deriveFont(Font.PLAIN));
-            listAllToggleDialogsButton.setInheritsPopupMenu(true);
-            sideToolBar.add(listAllToggleDialogsButton);
+            sideToolBar.add(listAllDialogsAction.createButton());
         }
 
@@ -661 +646 @@
         }
 
-        public void setButton(JButton button) {
-            this.button = button;
-            final ImageIcon icon = ImageProvider.get("audio-fwd");
-            putValue(SMALL_ICON, icon);
-            button.setPreferredSize(new Dimension(icon.getIconWidth(), icon.getIconHeight() + 64));
+        JButton createButton() {
+            button = new BasicArrowButton(SwingConstants.EAST) {
+
+                @Override
+                public Dimension getMaximumSize() {
+                    final Dimension dimension = ImageProvider.ImageSizes.TOOLBAR.getImageDimension();
+                    dimension.width = Integer.MAX_VALUE;
+                    return dimension;
+                }
+            };
+            button.setAction(this);
+            button.setAlignmentX(0.5f);
+            button.setInheritsPopupMenu(true);
+            return button;
         }