Changeset 17650 in josm for trunk/src/org

Timestamp:

2021-03-23T23:31:54+01:00 (4 years ago)

Author:

simon04

Message:

Extract IconTextCheckBox widget

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• tagging/presets/items/Check.java (modified) (4 diffs)
• widgets/IconTextCheckBox.java (added)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
-import java.awt.GridBagLayout;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10 +7 @@
 import java.util.List;
 
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 
@@ -17 +13 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.widgets.IconTextCheckBox;
 import org.openstreetmap.josm.gui.widgets.QuadStateCheckBox;
 import org.openstreetmap.josm.tools.GBC;
@@ -88 +85 @@
 
         if (icon != null) {
-            JPanel checkPanel = new JPanel(new GridBagLayout());
-            checkPanel.add(check, GBC.std());
-            JLabel label = new JLabel(locale_text);
-            addIcon(label);
-            label.addMouseListener(new MouseAdapter() {
-                @Override
-                public void mousePressed(MouseEvent e) {
-                    check.getMouseAdapter().mousePressed(e);
-                }
-            });
-            checkPanel.add(label);
-            checkPanel.add(new JLabel(), GBC.eol().fill());
+            JPanel checkPanel = IconTextCheckBox.wrap(check, locale_text, getIcon());
             p.add(checkPanel, GBC.eol()); // Do not fill, see #15104
         } else {